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

annotate libinterp/parse-tree/oct-parse.in.yy @ 16205:a8f9eb92fa6e classdef

maint: periodic merge of default to classdef

author	John W. Eaton <jwe@octave.org>
date	Wed, 06 Mar 2013 16:43:33 -0500
parents	libinterp/parse-tree/oct-parse.yy@0259254a3ccc libinterp/parse-tree/oct-parse.yy@127cccb037bf
children	3449bf257514

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
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 14084 diff changeset	3 Copyright (C) 1993-2012 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
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	6
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	8
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	10 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	12 option) any later version.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	13
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	18
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	19 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	20 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	21 <http://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22
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 // Parser for Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	26
767 42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 751 diff changeset	27 // C decarations.
42731861ee09 [project @ 1994-10-05 21:26:54 by jwe] jwe parents: 751 diff changeset	28
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	29 %{
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	30 #define YYDEBUG 1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	31
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 206 diff changeset	32 #ifdef HAVE_CONFIG_H
1229 7d7c3eaa1d3b [project @ 1995-04-10 01:04:13 by jwe] jwe parents: 1162 diff changeset	33 #include <config.h>
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 206 diff changeset	34 #endif
a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 206 diff changeset	35
3178 09a3064a3a17 [project @ 1998-06-23 03:46:42 by jwe] jwe parents: 3165 diff changeset	36 #include <cassert>
10463 bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	37 #include <cstdio>
bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	38 #include <cstdlib>
2427 2f50b24ce84f [project @ 1996-10-25 06:15:28 by jwe] jwe parents: 2375 diff changeset	39
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	40 #include <iostream>
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	41 #include <map>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	42 #include <sstream>
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	43
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3903 diff changeset	44 #include "Cell.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	45 #include "Matrix.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	46 #include "cmd-edit.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	47 #include "cmd-hist.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	48 #include "file-ops.h"
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	49 #include "file-stat.h"
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	50 #include "oct-env.h"
3712 7066a8065e7e [project @ 2000-08-22 06:21:20 by jwe] jwe parents: 3665 diff changeset	51 #include "oct-time.h"
4171 04694e5b4239 [project @ 2002-11-12 20:27:24 by jwe] jwe parents: 4131 diff changeset	52 #include "quit.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	53
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	54 #include "comment-list.h"
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	55 #include "defaults.h"
2166 d68119516779 [project @ 1996-05-13 13:41:55 by jwe] jwe parents: 2124 diff changeset	56 #include "defun.h"
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	57 #include "dirfns.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	58 #include "dynamic-ld.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	59 #include "error.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	60 #include "input.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	61 #include "lex.h"
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	62 #include "load-path.h"
1743 ab8612a09449 [project @ 1996-01-12 11:25:30 by jwe] jwe parents: 1740 diff changeset	63 #include "oct-hist.h"
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	64 #include "oct-map.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	65 #include "ov-classdef.h"
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	66 #include "ov-fcn-handle.h"
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	67 #include "ov-usr-fcn.h"
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	68 #include "ov-null-mat.h"
1670 6708c53892c1 [project @ 1995-12-27 04:33:00 by jwe] jwe parents: 1623 diff changeset	69 #include "toplev.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	70 #include "pager.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	71 #include "parse.h"
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	72 #include "parse-private.h"
2987 ae20b3f37f5e [project @ 1997-05-16 07:05:15 by jwe] jwe parents: 2982 diff changeset	73 #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	74 #include "pt-eval.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	75 #include "pt-funcall.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	76 #include "symtab.h"
8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	77 #include "token.h"
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	78 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	79 #include "utils.h"
1351 8256c4c57419 [project @ 1995-09-05 08:02:08 by jwe] jwe parents: 1315 diff changeset	80 #include "variables.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	81
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	82 // oct-parse.h must be included after pt-all.h
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	83 #include <oct-parse.h>
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	84
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	85 extern int octave_lex (YYSTYPE , void );
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	86
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	87 // Global access to currently active lexer.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	88 // FIXME -- to be removed after more parser+lexer refactoring.
16158 7eb614760ddb rename lexical_feedback to octave_lexer John W. Eaton <jwe@octave.org> parents: 16157 diff changeset	89 octave_lexer *CURR_LEXER = 0;
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	90
10426 4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	91 #if defined (GNULIB_NAMESPACE)
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	92 // Calls to the following functions appear in the generated output from
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	93 // Bison without the namespace tag. Redefine them so we will use them
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	94 // via the gnulib namespace.
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	95 #define fclose GNULIB_NAMESPACE::fclose
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	96 #define fprintf GNULIB_NAMESPACE::fprintf
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	97 #define malloc GNULIB_NAMESPACE::malloc
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	98 #endif
4db7beace28e oct-parse.yy, lex.ll: use symbols via gnulib namespace John W. Eaton <jwe@octave.org> parents: 10411 diff changeset	99
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	100 // TRUE means we are using readline.
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	101 // (--no-line-editing)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	102 bool line_editing = true;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	103
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	104 // TRUE means we printed messages about reading startup files.
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	105 bool reading_startup_message_printed = false;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	106
3903 1dbe160ea0d1 [project @ 2002-04-23 03:40:25 by jwe] jwe parents: 3883 diff changeset	107 // Keep track of symbol table information when parsing functions.
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	108 symtab_context parser_symtab_context;
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4237 diff changeset	109
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	110 // List of autoloads (function -> file mapping).
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	111 static std::map<std::string, std::string> autoload_map;
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	112
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	113 // 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	114 // the file.
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	115
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	116 static void yyerror (octave_parser& curr_parser, const char *s);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	117
8448 d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	118 // Finish building a statement.
d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	119 template <class T>
d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	120 static tree_statement *
d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	121 make_statement (T *arg)
d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	122 {
8471 02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	123 octave_comment_list *comment = octave_comment_buffer::get_comment ();
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	124
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	125 return new tree_statement (arg, comment);
8448 d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	126 }
d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	127
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	128 #define ABORT_PARSE \
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	129 do \
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	130 { \
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	131 yyerrok; \
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	132 if (! parser_symtab_context.empty ()) \
8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	133 parser_symtab_context.pop (); \
14584 3a10d5bdada8 src/symtab.yy (ABORT_PARSE): Prevent multiple parse errors in eval (bug #35154) Max Brister <max@2bass.com> parents: 14544 diff changeset	134 if ((interactive \|\| forced_interactive) \
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	135 && ! (curr_lexer)->input_from_eval_string ()) \
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	136 YYACCEPT; \
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	137 else \
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	138 YYABORT; \
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	139 } \
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	140 while (0)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	141
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	142 #define curr_lexer curr_parser.curr_lexer
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	143 #define scanner curr_lexer->scanner
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	144
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	145 %}
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	146
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	147 // Bison declarations.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	148
4813 fba5c6e96e0f [project @ 2004-03-03 23:35:43 by jwe] jwe parents: 4753 diff changeset	149 // Don't add spaces around the = here; it causes some versions of
fba5c6e96e0f [project @ 2004-03-03 23:35:43 by jwe] jwe parents: 4753 diff changeset	150 // bison to fail to properly recognize the directive.
fba5c6e96e0f [project @ 2004-03-03 23:35:43 by jwe] jwe parents: 4753 diff changeset	151
fba5c6e96e0f [project @ 2004-03-03 23:35:43 by jwe] jwe parents: 4753 diff changeset	152 %name-prefix="octave_"
4753 9f0ce1536368 [project @ 2004-02-13 17:55:24 by jwe] jwe parents: 4699 diff changeset	153
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	154 // 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	155 // 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	156 // reentrant because both still use many global variables. It should be
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	157 // safe to create a parser object and call it while anotehr parser
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	158 // 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	159 // 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	160 // 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	161 // 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	162
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	163 %define api.pure
16174 39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16167 diff changeset	164 %PUSH_PULL_DECL%
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	165 %parse-param { octave_parser& curr_parser }
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	166 %lex-param { void *scanner }
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	167
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	168 %union
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	169 {
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	170 // The type of the basic tokens returned by the lexer.
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	171 token *tok_val;
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	172
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	173 // Comment strings that we need to deal with mid-rule.
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	174 octave_comment_list *comment_type;
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	175
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	176 // Types for the nonterminals we generate.
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	177 char sep_type;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	178 token *tok_type;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	179 tree *tree_type;
1829 7d2982b55242 [project @ 1996-02-02 14:12:59 by jwe] jwe parents: 1826 diff changeset	180 tree_matrix *tree_matrix_type;
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	181 tree_cell *tree_cell_type;
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	182 tree_expression *tree_expression_type;
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	183 tree_constant *tree_constant_type;
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	184 tree_fcn_handle *tree_fcn_handle_type;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	185 tree_funcall *tree_funcall_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	186 tree_function_def *tree_function_def_type;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	187 tree_anon_fcn_handle *tree_anon_fcn_handle_type;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	188 tree_identifier *tree_identifier_type;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	189 tree_index_expression *tree_index_expression_type;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	190 tree_colon_expression *tree_colon_expression_type;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	191 tree_argument_list *tree_argument_list_type;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	192 tree_parameter_list *tree_parameter_list_type;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	193 tree_command *tree_command_type;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	194 tree_if_command *tree_if_command_type;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	195 tree_if_clause *tree_if_clause_type;
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	196 tree_if_command_list *tree_if_command_list_type;
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	197 tree_switch_command *tree_switch_command_type;
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	198 tree_switch_case *tree_switch_case_type;
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	199 tree_switch_case_list *tree_switch_case_list_type;
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	200 tree_decl_elt *tree_decl_elt_type;
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	201 tree_decl_init_list *tree_decl_init_list_type;
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	202 tree_decl_command *tree_decl_command_type;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	203 tree_statement *tree_statement_type;
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	204 tree_statement_list *tree_statement_list_type;
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	205 octave_user_function *octave_user_function_type;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	206
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	207 tree_classdef *tree_classdef_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	208 tree_classdef_attribute* tree_classdef_attribute_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	209 tree_classdef_attribute_list* tree_classdef_attribute_list_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	210 tree_classdef_superclass* tree_classdef_superclass_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	211 tree_classdef_superclass_list* tree_classdef_superclass_list_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	212 tree_classdef_body* tree_classdef_body_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	213 tree_classdef_property* tree_classdef_property_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	214 tree_classdef_property_list* tree_classdef_property_list_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	215 tree_classdef_properties_block* tree_classdef_properties_block_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	216 tree_classdef_methods_list* tree_classdef_methods_list_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	217 tree_classdef_methods_block* tree_classdef_methods_block_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	218 tree_classdef_event* tree_classdef_event_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	219 tree_classdef_events_list* tree_classdef_events_list_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	220 tree_classdef_events_block* tree_classdef_events_block_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	221 tree_classdef_enum* tree_classdef_enum_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	222 tree_classdef_enum_list* tree_classdef_enum_list_type;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	223 tree_classdef_enum_block* tree_classdef_enum_block_type;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	224 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	225
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	226 // Tokens with line and column information.
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	227 %token <tok_val> '=' ':' '-' '+' '*' '/'
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	228 %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	229 %token <tok_val> EMUL_EQ EDIV_EQ ELEFTDIV_EQ EPOW_EQ AND_EQ OR_EQ
2899 0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	230 %token <tok_val> LSHIFT_EQ RSHIFT_EQ LSHIFT RSHIFT
428 fa0453b25410 [project @ 1994-05-25 01:06:28 by jwe] jwe parents: 341 diff changeset	231 %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	232 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	233 %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	234 %token <tok_val> LEFTDIV EMUL EDIV ELEFTDIV EPLUS EMINUS
cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1266 diff changeset	235 %token <tok_val> QUOTE TRANSPOSE
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	236 %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	237 %token <tok_val> NUM IMAG_NUM
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	238 %token <tok_val> STRUCT_ELT
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	239 %token <tok_val> NAME
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	240 %token <tok_val> END
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5189 diff changeset	241 %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	242 %token <tok_val> FOR PARFOR WHILE DO UNTIL
1491 893b416bb919 [project @ 1995-09-29 04:03:01 by jwe] jwe parents: 1489 diff changeset	243 %token <tok_val> IF ELSEIF ELSE
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	244 %token <tok_val> SWITCH CASE OTHERWISE
1491 893b416bb919 [project @ 1995-09-29 04:03:01 by jwe] jwe parents: 1489 diff changeset	245 %token <tok_val> BREAK CONTINUE FUNC_RET
924 8b0920cc1d64 [project @ 1994-11-15 00:40:50 by jwe] jwe parents: 922 diff changeset	246 %token <tok_val> UNWIND CLEANUP
1489 3e705c864019 [project @ 1995-09-28 05:38:26 by jwe] jwe parents: 1371 diff changeset	247 %token <tok_val> TRY CATCH
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14293 diff changeset	248 %token <tok_val> GLOBAL PERSISTENT
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	249 %token <tok_val> FCN_HANDLE
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	250 %token <tok_val> CLASSDEF
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	251 %token <tok_val> PROPERTIES METHODS EVENTS ENUMERATION
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	252 %token <tok_val> METAQUERY
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	253 %token <tok_val> SUPERCLASSREF
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	254 %token <tok_val> GET SET
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	255
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	256 // Other tokens.
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	257 %token END_OF_INPUT LEXICAL_ERROR
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	258 <<<<<<< local
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	259 %token FCN SCRIPT_FILE CLASSDEF_FILE FUNCTION_FILE
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	260 =======
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	261 %token FCN INPUT_FILE CLASSDEF
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	262 >>>>>>> other
7587 1f662945c2be handle varargin and varargout without keywords John W. Eaton <jwe@octave.org> parents: 7562 diff changeset	263 // %token VARARGIN VARARGOUT
5296 4e753a157ed2 [project @ 2005-04-21 17:52:41 by jwe] jwe parents: 5279 diff changeset	264 %token CLOSE_BRACE
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	265
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	266 // Nonterminals we construct.
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	267 <<<<<<< local
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	268 %type <comment_type> stash_comment function_beg
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	269 %type <tok_type> classdef_beg
14533 e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	270 %type <sep_type> sep_no_nl opt_sep_no_nl sep opt_sep opt_comma
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	271 =======
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	272 %type <comment_type> stash_comment function_beg classdef_beg
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	273 %type <comment_type> properties_beg methods_beg events_beg enum_beg
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	274 %type <sep_type> sep_no_nl opt_sep_no_nl nl opt_nl sep opt_sep opt_comma
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	275 >>>>>>> other
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	276 %type <tree_type> input
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	277 %type <tree_constant_type> string constant magic_colon
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	278 %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	279 %type <tree_fcn_handle_type> fcn_handle
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	280 %type <tree_matrix_type> matrix_rows matrix_rows1
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	281 %type <tree_cell_type> cell_rows cell_rows1
5102 b04b30d30c66 [project @ 2004-12-28 01:59:05 by jwe] jwe parents: 5013 diff changeset	282 %type <tree_expression_type> matrix cell
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	283 %type <tree_expression_type> primary_expr oper_expr
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	284 %type <tree_expression_type> simple_expr colon_expr assign_expr expression
10206 37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	285 %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	286 %type <tree_funcall_type> superclass_identifier meta_identifier
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	287 %type <octave_user_function_type> function1 function2
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	288 %type <tree_index_expression_type> word_list_cmd
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	289 %type <tree_colon_expression_type> colon_expr1
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	290 %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	291 %type <tree_argument_list_type> cell_or_matrix_row
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	292 %type <tree_parameter_list_type> param_list param_list1 param_list2
723 1c072f20b522 [project @ 1994-09-21 16:00:10 by jwe] jwe parents: 666 diff changeset	293 %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	294 %type <tree_command_type> command select_command loop_command
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	295 <<<<<<< local
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	296 %type <tree_command_type> jump_command except_command
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	297 %type <tree_function_def_type> function
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	298 %type <tree_classdef_type> classdef
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	299 %type <tree_command_type> script_file classdef_file
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	300 %type <tree_command_type> function_file function_list
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	301 =======
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	302 %type <tree_command_type> jump_command except_command function
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	303 %type <tree_command_type> file classdef
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	304 >>>>>>> other
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	305 %type <tree_if_command_type> if_command
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	306 %type <tree_if_clause_type> elseif_clause else_clause
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	307 %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	308 %type <tree_switch_command_type> switch_command
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	309 %type <tree_switch_case_type> switch_case default_case
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	310 %type <tree_switch_case_list_type> case_list1 case_list
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	311 %type <tree_decl_elt_type> decl2
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	312 %type <tree_decl_init_list_type> decl1
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	313 %type <tree_decl_command_type> declaration
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	314 %type <tree_statement_type> statement function_end
627 739d16c30481 [project @ 1994-08-19 13:23:14 by jwe] jwe parents: 620 diff changeset	315 %type <tree_statement_list_type> simple_list simple_list1 list list1
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	316 %type <tree_statement_list_type> opt_list input1
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	317
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	318 %type <tree_classdef_attribute_type> attr
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	319 %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	320 %type <tree_classdef_superclass_type> superclass
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	321 %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	322 %type <tree_classdef_body_type> class_body
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	323 %type <tree_classdef_property_type> class_property
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	324 %type <tree_classdef_property_list_type> property_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	325 %type <tree_classdef_properties_block_type> properties_block
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	326 %type <tree_classdef_methods_list_type> methods_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	327 %type <tree_classdef_methods_block_type> methods_block
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	328 %type <tree_classdef_event_type> class_event
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	329 %type <tree_classdef_events_list_type> events_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	330 %type <tree_classdef_events_block_type> events_block
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	331 %type <tree_classdef_enum_type> class_enum
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	332 %type <tree_classdef_enum_list_type> enum_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	333 %type <tree_classdef_enum_block_type> enum_block
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	334
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	335 // Precedence and associativity.
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	336 %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 LSHIFT_EQ RSHIFT_EQ
4023 ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	337 %left EXPR_OR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	338 %left EXPR_AND_AND
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	339 %left EXPR_OR
ef3caf27cb9c [project @ 2002-08-07 06:54:41 by jwe] jwe parents: 4018 diff changeset	340 %left EXPR_AND
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	341 %left EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT
2899 0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	342 %left LSHIFT RSHIFT
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	343 %left ':'
1276 cbdf7db98554 [project @ 1995-04-24 15:31:24 by jwe] jwe parents: 1266 diff changeset	344 %left '-' '+' EPLUS EMINUS
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	345 %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	346 %right UNARY EXPR_NOT
5667 ec3ffbf9982b [project @ 2006-03-15 02:51:39 by jwe] jwe parents: 5626 diff changeset	347 %left POW EPOW QUOTE TRANSPOSE
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	348 %right PLUS_PLUS MINUS_MINUS
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	349 %left '(' '.' '{'
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	350
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	351 // Where to start.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	352 %start input
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	353
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	354 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	355
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	356 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	357 // Statements and statement lists
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	358 // ==============================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	359
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	360 input : input1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	361 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	362 curr_parser.stmt_list = $1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	363 promptflag = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	364 YYACCEPT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	365 }
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	366 <<<<<<< local
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	367 \| function_file
11258 795c97ace02c eliminate some possible memory leaks John W. Eaton <jwe@octave.org> parents: 11225 diff changeset	368 { YYACCEPT; }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	369 \| classdef_file
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	370 { YYACCEPT; }
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	371 =======
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	372 >>>>>>> other
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	373 \| simple_list parse_error
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	374 { ABORT_PARSE; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	375 \| parse_error
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	376 { ABORT_PARSE; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	377 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	378
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	379 input1 : '\n'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	380 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	381 \| END_OF_INPUT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	382 {
16164 c5bfdc4c0963 move end_of_input flag from octve_parser class to octave_lexer class John W. Eaton <jwe@octave.org> parents: 16158 diff changeset	383 curr_lexer->end_of_input = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	384 $$ = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	385 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	386 \| simple_list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	387 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	388 \| simple_list '\n'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	389 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	390 \| simple_list END_OF_INPUT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	391 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	392 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	393
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	394 simple_list : simple_list1 opt_sep_no_nl
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	395 { $$ = curr_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	396 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	397
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	398 simple_list1 : statement
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	399 { $$ = curr_parser.make_statement_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	400 \| simple_list1 sep_no_nl statement
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	401 { $$ = curr_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	402 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	403
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	404 opt_list : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	405 { $$ = new tree_statement_list (); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	406 \| list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	407 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	408 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	409
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	410 list : list1 opt_sep
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	411 { $$ = curr_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	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 list1 : statement
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	415 { $$ = curr_parser.make_statement_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	416 \| list1 sep statement
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	417 { $$ = curr_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	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 statement : expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	421 { $$ = make_statement ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	422 \| command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	423 { $$ = make_statement ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	424 \| word_list_cmd
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	425 { $$ = make_statement ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	426 ;
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	427
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	428 // =================
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	429 // Word-list command
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	430 // =================
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	431
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	432 // 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	433 // 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	434 // WHILE, etc.
5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	435
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	436 word_list_cmd : identifier word_list
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	437 { $$ = curr_parser.make_index_expression ($1, $2, '('); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	438 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	439
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	440 word_list : string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	441 { $$ = new tree_argument_list ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	442 \| word_list string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	443 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	444 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	445 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	446 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	447 ;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	448
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	449 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	450 // Expressions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	451 // ===========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	452
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	453 identifier : NAME
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	454 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	455 symbol_table::symbol_record *sr = $1->sym_rec ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	456 $$ = new tree_identifier (*sr, $1->line (), $1->column ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	457 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	458 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	459
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	460 superclass_identifier
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	461 : SUPERCLASSREF
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	462 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	463 std::string method_nm = $1->superclass_method_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	464 std::string package_nm = $1->superclass_package_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	465 std::string class_nm = $1->superclass_class_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	466
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	467 $$ = curr_parser->make_superclass_ref
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	468 (method_nm, package_nm, class_nm,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	469 $1->line (), $1->column ());
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	470 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	471 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	472
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	473 meta_identifier : METAQUERY
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	474 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	475 std::string package_nm = $1->meta_package_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	476 std::string class_nm = $1->meta_class_name ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	477
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	478 $$ = curr_parser->make_meta_class_query
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	479 (package_nm, class_nm,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	480 $1->line (), $1->column ());
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	481 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	482 ;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	483
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	484 string : DQ_STRING
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	485 { $$ = curr_parser.make_constant (DQ_STRING, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	486 \| SQ_STRING
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	487 { $$ = curr_parser.make_constant (SQ_STRING, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	488 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	489
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	490 constant : NUM
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	491 { $$ = curr_parser.make_constant (NUM, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	492 \| IMAG_NUM
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	493 { $$ = curr_parser.make_constant (IMAG_NUM, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	494 \| string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	495 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	496 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	497
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	498 matrix : '[' ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	499 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	500 $$ = new tree_constant (octave_null_matrix::instance);
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	501 curr_lexer->looking_at_matrix_or_assign_lhs = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	502 curr_lexer->pending_local_variables.clear ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	503 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	504 \| '[' ';' ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	505 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	506 $$ = new tree_constant (octave_null_matrix::instance);
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	507 curr_lexer->looking_at_matrix_or_assign_lhs = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	508 curr_lexer->pending_local_variables.clear ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	509 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	510 \| '[' ',' ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	511 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	512 $$ = new tree_constant (octave_null_matrix::instance);
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	513 curr_lexer->looking_at_matrix_or_assign_lhs = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	514 curr_lexer->pending_local_variables.clear ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	515 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	516 \| '[' matrix_rows ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	517 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	518 $$ = curr_parser.finish_matrix ($2);
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	519 curr_lexer->looking_at_matrix_or_assign_lhs = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	520 curr_lexer->pending_local_variables.clear ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	521 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	522 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	523
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	524 matrix_rows : matrix_rows1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	525 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	526 \| matrix_rows1 ';' // Ignore trailing semicolon.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	527 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	528 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	529
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	530 matrix_rows1 : cell_or_matrix_row
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	531 { $$ = new tree_matrix ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	532 \| matrix_rows1 ';' cell_or_matrix_row
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	533 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	534 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	535 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	536 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	537 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	538
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	539 cell : '{' '}'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	540 { $$ = new tree_constant (octave_value (Cell ())); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	541 \| '{' ';' '}'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	542 { $$ = new tree_constant (octave_value (Cell ())); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	543 \| '{' cell_rows '}'
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	544 { $$ = curr_parser.finish_cell ($2); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	545 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	546
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	547 cell_rows : cell_rows1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	548 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	549 \| cell_rows1 ';' // Ignore trailing semicolon.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	550 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	551 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	552
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	553 cell_rows1 : cell_or_matrix_row
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	554 { $$ = new tree_cell ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	555 \| cell_rows1 ';' cell_or_matrix_row
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	556 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	557 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	558 $$ = $1;
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 ;
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	561
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	562 cell_or_matrix_row
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	563 : arg_list
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	564 { $$ = curr_parser.validate_matrix_row ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	565 \| arg_list ',' // Ignore trailing comma.
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	566 { $$ = curr_parser.validate_matrix_row ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	567 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	568
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	569 fcn_handle : '@' FCN_HANDLE
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	570 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	571 $$ = curr_parser.make_fcn_handle ($2);
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	572 curr_lexer->looking_at_function_handle--;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	573 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	574 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	575
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	576 anon_fcn_handle : '@' param_list statement
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	577 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	578 curr_lexer->quote_is_transpose = false;
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	579 $$ = curr_parser.make_anon_fcn_handle ($2, $3);
13237 1bfca2bbea8b fix parsing of anonymous functions inside cell array lists. John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	580 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	581 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	582
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	583 primary_expr : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	584 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	585 \| constant
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	586 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	587 \| fcn_handle
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	588 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	589 \| matrix
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	590 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	591 \| cell
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	592 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	593 \| meta_identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	594 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	595 \| superclass_identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	596 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	597 \| '(' expression ')'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	598 { $$ = $2->mark_in_parens (); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	599 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	600
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	601 magic_colon : ':'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	602 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	603 octave_value tmp (octave_value::magic_colon_t);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	604 $$ = new tree_constant (tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	605 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	606 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	607
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	608 magic_tilde : EXPR_NOT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	609 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	610 $$ = new tree_black_hole ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	611 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	612 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	613
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	614 arg_list : expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	615 { $$ = new tree_argument_list ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	616 \| magic_colon
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	617 { $$ = new tree_argument_list ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	618 \| magic_tilde
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	619 { $$ = new tree_argument_list ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	620 \| arg_list ',' magic_colon
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	621 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	622 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	623 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	624 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	625 \| arg_list ',' magic_tilde
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	626 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	627 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	628 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	629 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	630 \| arg_list ',' expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	631 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	632 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	633 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	634 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	635 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	636
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	637 indirect_ref_op : '.'
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	638 { curr_lexer->looking_at_indirect_ref = true; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	639 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	640
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	641 oper_expr : primary_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	642 { $$ = $1; }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	643 \| oper_expr PLUS_PLUS
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	644 { $$ = curr_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	645 \| oper_expr MINUS_MINUS
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	646 { $$ = curr_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	647 \| oper_expr '(' ')'
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	648 { $$ = curr_parser.make_index_expression ($1, 0, '('); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	649 \| oper_expr '(' arg_list ')'
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	650 { $$ = curr_parser.make_index_expression ($1, $3, '('); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	651 \| oper_expr '{' '}'
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	652 { $$ = curr_parser.make_index_expression ($1, 0, '{'); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	653 \| oper_expr '{' arg_list '}'
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	654 { $$ = curr_parser.make_index_expression ($1, $3, '{'); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	655 \| oper_expr QUOTE
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	656 { $$ = curr_parser.make_postfix_op (QUOTE, $1, $2); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	657 \| oper_expr TRANSPOSE
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	658 { $$ = curr_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	659 \| oper_expr indirect_ref_op STRUCT_ELT
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	660 { $$ = curr_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	661 \| oper_expr indirect_ref_op '(' expression ')'
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	662 { $$ = curr_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	663 \| PLUS_PLUS oper_expr %prec UNARY
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	664 { $$ = curr_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	665 \| MINUS_MINUS oper_expr %prec UNARY
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	666 { $$ = curr_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	667 \| EXPR_NOT oper_expr %prec UNARY
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	668 { $$ = curr_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	669 \| '+' oper_expr %prec UNARY
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	670 { $$ = curr_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	671 \| '-' oper_expr %prec UNARY
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	672 { $$ = curr_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	673 \| oper_expr POW oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	674 { $$ = curr_parser.make_binary_op (POW, $1, $2, $3); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	675 \| oper_expr EPOW oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	676 { $$ = curr_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	677 \| oper_expr '+' oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	678 { $$ = curr_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	679 \| oper_expr '-' oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	680 { $$ = curr_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	681 \| oper_expr '*' oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	682 { $$ = curr_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	683 \| oper_expr '/' oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	684 { $$ = curr_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	685 \| oper_expr EPLUS oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	686 { $$ = curr_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	687 \| oper_expr EMINUS oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	688 { $$ = curr_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	689 \| oper_expr EMUL oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	690 { $$ = curr_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	691 \| oper_expr EDIV oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	692 { $$ = curr_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	693 \| oper_expr LEFTDIV oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	694 { $$ = curr_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	695 \| oper_expr ELEFTDIV oper_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	696 { $$ = curr_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	697 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	698
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	699 colon_expr : colon_expr1
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	700 { $$ = curr_parser.finish_colon_expression ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	701 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	702
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	703 colon_expr1 : oper_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	704 { $$ = new tree_colon_expression ($1); }
12627 002948ae5bc0 fix precedence level of transpose operators (bug #32533) John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	705 \| colon_expr1 ':' oper_expr
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	706 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	707 if (! ($$ = $1->append ($3)))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	708 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	709 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	710 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	711
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	712 simple_expr : colon_expr
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	713 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	714 \| simple_expr LSHIFT simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	715 { $$ = curr_parser.make_binary_op (LSHIFT, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	716 \| simple_expr RSHIFT simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	717 { $$ = curr_parser.make_binary_op (RSHIFT, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	718 \| simple_expr EXPR_LT simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	719 { $$ = curr_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	720 \| simple_expr EXPR_LE simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	721 { $$ = curr_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	722 \| simple_expr EXPR_EQ simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	723 { $$ = curr_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	724 \| simple_expr EXPR_GE simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	725 { $$ = curr_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	726 \| simple_expr EXPR_GT simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	727 { $$ = curr_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	728 \| simple_expr EXPR_NE simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	729 { $$ = curr_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	730 \| simple_expr EXPR_AND simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	731 { $$ = curr_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	732 \| simple_expr EXPR_OR simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	733 { $$ = curr_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	734 \| simple_expr EXPR_AND_AND simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	735 { $$ = curr_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	736 \| simple_expr EXPR_OR_OR simple_expr
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	737 { $$ = curr_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	738 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	739
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	740 // Arrange for the lexer to return CLOSE_BRACE for ']' by looking ahead
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	741 // one token for an assignment op.
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	742
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	743 assign_lhs : simple_expr
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	744 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	745 $$ = new tree_argument_list ($1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	746 $$->mark_as_simple_assign_lhs ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	747 }
14533 e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	748 \| '[' arg_list opt_comma CLOSE_BRACE
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	749 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	750 $$ = $2;
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	751 curr_lexer->looking_at_matrix_or_assign_lhs = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	752 for (std::set<std::string>::const_iterator p = curr_lexer->pending_local_variables.begin ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	753 p != curr_lexer->pending_local_variables.end ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	754 p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	755 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	756 symbol_table::force_variable (*p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	757 }
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	758 curr_lexer->pending_local_variables.clear ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	759 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	760 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	761
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	762 assign_expr : assign_lhs '=' expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	763 { $$ = curr_parser.make_assign_op ('=', $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	764 \| assign_lhs ADD_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	765 { $$ = curr_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	766 \| assign_lhs SUB_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	767 { $$ = curr_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	768 \| assign_lhs MUL_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	769 { $$ = curr_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	770 \| assign_lhs DIV_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	771 { $$ = curr_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	772 \| assign_lhs LEFTDIV_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	773 { $$ = curr_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	774 \| assign_lhs POW_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	775 { $$ = curr_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	776 \| assign_lhs LSHIFT_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	777 { $$ = curr_parser.make_assign_op (LSHIFT_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	778 \| assign_lhs RSHIFT_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	779 { $$ = curr_parser.make_assign_op (RSHIFT_EQ, $1, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	780 \| assign_lhs EMUL_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	781 { $$ = curr_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	782 \| assign_lhs EDIV_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	783 { $$ = curr_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	784 \| assign_lhs ELEFTDIV_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	785 { $$ = curr_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	786 \| assign_lhs EPOW_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	787 { $$ = curr_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	788 \| assign_lhs AND_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	789 { $$ = curr_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	790 \| assign_lhs OR_EQ expression
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	791 { $$ = curr_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	792 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	793
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	794 expression : simple_expr
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	795 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	796 \| assign_expr
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	797 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	798 \| anon_fcn_handle
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	799 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	800 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	801
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	802 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	803 // Commands, declarations, and function definitions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	804 // ================================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	805
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	806 command : declaration
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	807 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	808 \| select_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	809 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	810 \| loop_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	811 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	812 \| jump_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	813 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	814 \| except_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	815 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	816 \| function
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	817 { $$ = $1; }
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	818 \| file
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	819 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	820 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	821
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	822 // =====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	823 // Declaration statemnts
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	824 // =====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	825
8701 1652e39b934e handle command names in declaration lists John W. Eaton <jwe@octave.org> parents: 8697 diff changeset	826 parsing_decl_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	827 : // empty
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	828 { curr_lexer->looking_at_decl_list = true; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	829
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	830 declaration : GLOBAL parsing_decl_list decl1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	831 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	832 $$ = curr_parser.make_decl_command (GLOBAL, $1, $3);
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	833 curr_lexer->looking_at_decl_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	834 }
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14293 diff changeset	835 \| PERSISTENT parsing_decl_list decl1
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	836 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	837 $$ = curr_parser.make_decl_command (PERSISTENT, $1, $3);
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	838 curr_lexer->looking_at_decl_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	839 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	840 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	841
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	842 decl1 : decl2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	843 { $$ = new tree_decl_init_list ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	844 \| decl1 decl2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	845 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	846 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	847 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	848 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	849 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	850
7634 ae90e05ad299 fix parameter list initializer bug John W. Eaton <jwe@octave.org> parents: 7587 diff changeset	851 decl_param_init : // empty
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	852 { curr_lexer->looking_at_initializer_expression = true; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	853
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	854 decl2 : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	855 { $$ = new tree_decl_elt ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	856 \| identifier '=' decl_param_init expression
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	857 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	858 curr_lexer->looking_at_initializer_expression = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	859 $$ = new tree_decl_elt ($1, $4);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	860 }
10206 37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	861 \| magic_tilde
37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	862 {
37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	863 $$ = new tree_decl_elt ($1);
37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	864 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	865 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	866
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	867 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	868 // Selection statements
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	869 // ====================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	870
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	871 select_command : if_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	872 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	873 \| switch_command
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	874 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	875 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	876
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	877 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	878 // If statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	879 // ============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	880
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	881 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	882 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	883 if (! ($$ = curr_parser.finish_if_command ($1, $3, $4, $2)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	884 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	885 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	886 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	887
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	888 if_cmd_list : if_cmd_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	889 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	890 \| if_cmd_list1 else_clause
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 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	893 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	894 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	895 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	896
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	897 if_cmd_list1 : expression opt_sep opt_list
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	898 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	899 $1->mark_braindead_shortcircuit (curr_lexer->fcn_file_full_name);
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	900
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	901 $$ = curr_parser.start_if_command ($1, $3);
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	902 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	903 \| if_cmd_list1 elseif_clause
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	904 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	905 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	906 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	907 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	908 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	909
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	910 elseif_clause : ELSEIF stash_comment opt_sep expression opt_sep opt_list
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	911 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	912 $4->mark_braindead_shortcircuit (curr_lexer->fcn_file_full_name);
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	913
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	914 $$ = curr_parser.make_elseif_clause ($1, $4, $6, $2);
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	915 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	916 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	917
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	918 else_clause : ELSE stash_comment opt_sep opt_list
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	919 { $$ = new tree_if_clause ($4, $2); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	920 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	921
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	922 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	923 // Switch statement
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	924 // ================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	925
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	926 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	927 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	928 if (! ($$ = curr_parser.finish_switch_command ($1, $3, $5, $6, $2)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	929 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	930 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	931 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	932
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	933 case_list : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	934 { $$ = new 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	935 \| default_case
2da532d0f41c accept otherwise clause in switch statement without preceding case statements John W. Eaton <jwe@octave.org> parents: 11258 diff changeset	936 { $$ = new tree_switch_case_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	937 \| case_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	938 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	939 \| case_list1 default_case
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	940 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	941 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	942 $$ = $1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	943 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	944 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	945
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	946 case_list1 : switch_case
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	947 { $$ = new tree_switch_case_list ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	948 \| case_list1 switch_case
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	949 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	950 $1->append ($2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	951 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	952 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	953 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	954
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	955 switch_case : CASE stash_comment opt_sep expression opt_sep opt_list
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	956 { $$ = curr_parser.make_switch_case ($1, $4, $6, $2); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	957 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	958
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	959 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	960 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	961 $$ = new tree_switch_case ($4, $2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	962 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	963 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	964
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	965 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	966 // Looping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	967 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	968
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	969 loop_command : WHILE stash_comment expression opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	970 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	971 $3->mark_braindead_shortcircuit (curr_lexer->fcn_file_full_name);
11091 5677f3f7b5fa Matlab compatible short-circuit behavior for & and \| operators John W. Eaton <jwe@octave.org> parents: 11060 diff changeset	972
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	973 if (! ($$ = curr_parser.make_while_command ($1, $3, $5, $6, $2)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	974 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	975 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	976 \| 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	977 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	978 if (! ($$ = curr_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	979 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	980 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	981 \| 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	982 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	983 if (! ($$ = curr_parser.make_for_command (FOR, $1, $3, $5, 0,
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	984 $7, $8, $2)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	985 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	986 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	987 \| 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	988 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	989 if (! ($$ = curr_parser.make_for_command (FOR, $1, $4, $6, 0,
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	990 $9, $10, $2)))
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	991 ABORT_PARSE;
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	992 }
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	993 \| PARFOR stash_comment assign_lhs '=' 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	994 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	995 if (! ($$ = curr_parser.make_for_command (PARFOR, $1, $3, $5,
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	996 0, $7, $8, $2)))
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	997 ABORT_PARSE;
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	998 }
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	999 \| 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	1000 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1001 if (! ($$ = curr_parser.make_for_command (PARFOR, $1, $4, $6,
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	1002 $8, $11, $12, $2)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1003 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1004 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1005 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1006
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1007 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1008 // Jumping
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1009 // =======
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1010
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1011 jump_command : BREAK
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1012 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1013 if (! ($$ = curr_parser.make_break_command ($1)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1014 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1015 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1016 \| CONTINUE
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1017 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1018 if (! ($$ = curr_parser.make_continue_command ($1)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1019 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1020 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1021 \| FUNC_RET
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1022 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1023 if (! ($$ = curr_parser.make_return_command ($1)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1024 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1025 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1026 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1027
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1028 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1029 // Exceptions
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1030 // ==========
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1031
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1032 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	1033 stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1034 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1035 if (! ($$ = curr_parser.make_unwind_command ($1, $4, $8, $9, $2, $6)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1036 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1037 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1038 \| TRY stash_comment opt_sep opt_list CATCH
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1039 stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1040 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1041 if (! ($$ = curr_parser.make_try_command ($1, $4, $8, $9, $2, $6)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1042 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1043 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1044 \| TRY stash_comment opt_sep opt_list END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1045 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1046 if (! ($$ = curr_parser.make_try_command ($1, $4, 0, $5, $2, 0)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1047 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1048 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1049 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1050
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1051 // ===========================================
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	1052 // Some 'subroutines' for function definitions
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1053 // ===========================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1054
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1055 push_fcn_symtab : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1056 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1057 curr_parser.curr_fcn_depth++;
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1058
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1059 if (curr_parser.max_fcn_depth < curr_parser.curr_fcn_depth)
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1060 curr_parser.max_fcn_depth = curr_parser.curr_fcn_depth;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1061
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	1062 parser_symtab_context.push ();
8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	1063
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1064 symbol_table::set_scope (symbol_table::alloc_scope ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1065
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1066 curr_parser.function_scopes.push_back (symbol_table::current_scope ());
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1067
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1068 if (! curr_lexer->reading_script_file
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1069 && curr_parser.curr_fcn_depth == 1
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1070 && ! curr_parser.parsing_subfunctions)
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1071 curr_parser.primary_fcn_scope = symbol_table::current_scope ();
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1072
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1073 if (curr_lexer->reading_script_file
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1074 && curr_parser.curr_fcn_depth > 1)
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1075 curr_parser.bison_error ("nested functions not implemented in this context");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1076 }
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 // List of function parameters
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 param_list_beg : '('
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1084 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1085 curr_lexer->looking_at_parameter_list = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1086
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1087 if (curr_lexer->looking_at_function_handle)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1088 {
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	1089 parser_symtab_context.push ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1090 symbol_table::set_scope (symbol_table::alloc_scope ());
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1091 curr_lexer->looking_at_function_handle--;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1092 curr_lexer->looking_at_anon_fcn_args = true;
10315 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 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1096
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1097 param_list_end : ')'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1098 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1099 curr_lexer->looking_at_parameter_list = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1100 curr_lexer->looking_for_object_index = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1101 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1102 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1103
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1104 param_list : param_list_beg param_list1 param_list_end
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1105 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1106 curr_lexer->quote_is_transpose = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1107 $$ = $2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1108 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1109 \| param_list_beg error
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1110 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1111 curr_parser.bison_error ("invalid parameter list");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1112 $$ = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1113 ABORT_PARSE;
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
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1117 param_list1 : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1118 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1119 \| param_list2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1120 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1121 $1->mark_as_formal_parameters ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1122 if ($1->validate (tree_parameter_list::in))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1123 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1124 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1125 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1126 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1127 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1128
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1129 param_list2 : decl2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1130 { $$ = new tree_parameter_list ($1); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1131 \| param_list2 ',' decl2
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 $1->append ($3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1134 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1135 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1136 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1137
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1138 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1139 // List of function return value names
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1140 // ===================================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1141
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1142 return_list : '[' ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1143 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1144 curr_lexer->looking_at_return_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1145 $$ = new tree_parameter_list ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1146 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1147 \| return_list1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1148 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1149 curr_lexer->looking_at_return_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1150 if ($1->validate (tree_parameter_list::out))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1151 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1152 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1153 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1154 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1155 \| '[' return_list1 ']'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1156 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1157 curr_lexer->looking_at_return_list = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1158 if ($2->validate (tree_parameter_list::out))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1159 $$ = $2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1160 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1161 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1162 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1163 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1164
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1165 return_list1 : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1166 { $$ = new tree_parameter_list (new tree_decl_elt ($1)); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1167 \| return_list1 ',' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1168 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1169 $1->append (new tree_decl_elt ($3));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1170 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1171 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1172 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1173
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1174 // =======================
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1175 // Script or function file
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1176 // =======================
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1177
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1178 file : INPUT_FILE opt_nl opt_list END_OF_INPUT
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1179 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1180 if (! curr_lexer->reading_fcn_file)
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1181 {
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1182 tree_statement *end_of_script
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1183 = curr_parser.make_end ("endscript",
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1184 curr_lexer->input_line_number,
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1185 curr_lexer->current_input_column);
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1186
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1187 curr_parser.make_script ($3, end_of_script);
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1188 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1189
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1190 $$ = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1191 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1192 ;
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	1193
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1194 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1195 // Function definition
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1196 // ===================
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1197
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1198 function_beg : push_fcn_symtab FCN stash_comment
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1199 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1200 $$ = $3;
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1201 if (curr_lexer->reading_classdef_file
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1202 \|\| curr_lexer->parsing_classdef)
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1203 curr_lexer->maybe_classdef_get_set_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1204 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1205 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1206
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1207 function : function_beg function1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1208 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1209 $$ = curr_parser.finish_function (0, $2, $1);
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1210 curr_parser.recover_from_parsing_function ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1211 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1212 \| function_beg return_list '=' function1
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1213 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1214 $$ = curr_parser.finish_function ($2, $4, $1);
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1215 curr_parser.recover_from_parsing_function ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1216 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1217 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1218
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1219 fcn_name : identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1220 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1221 std::string id_name = $1->name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1222
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1223 curr_lexer->parsed_function_name.top () = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1224 curr_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	1225
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1226 $$ = $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1227 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1228 \| GET '.' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1229 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1230 curr_lexer->parsed_function_name.top () = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1231 curr_lexer->maybe_classdef_get_set_method = false;
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1232 curr_lexer->parsing_classdef_get_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1233 $$ = $3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1234 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1235 \| SET '.' identifier
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1236 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1237 curr_lexer->parsed_function_name.top () = true;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1238 curr_lexer->maybe_classdef_get_set_method = false;
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1239 curr_lexer->parsing_classdef_set_method = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1240 $$ = $3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1241 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1242 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1243
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1244 function1 : fcn_name function2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1245 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1246 std::string fname = $1->name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1247
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1248 delete $1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1249
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1250 if (! ($$ = curr_parser.frob_function (fname, $2)))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1251 ABORT_PARSE;
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 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1254
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1255 function2 : param_list opt_sep opt_list function_end
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1256 { $$ = curr_parser.start_function ($1, $3, $4); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1257 \| opt_sep opt_list function_end
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1258 { $$ = curr_parser.start_function (0, $2, $3); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1259 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1260
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1261 function_end : END
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1262 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1263 curr_parser.endfunction_found = true;
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1264 if (curr_parser.end_token_ok ($1, token::function_end))
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1265 $$ = curr_parser.make_end ("endfunction", $1->line (), $1->column ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1266 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1267 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1268 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1269 \| END_OF_INPUT
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1270 {
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	1271 // A lot of tests are based on the assumption that this is OK
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	1272 // if (curr_lexer->reading_script_file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1273 // {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1274 // curr_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	1275 // YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1276 // }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1277
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1278 if (curr_parser.endfunction_found)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1279 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1280 curr_parser.bison_error ("inconsistent function endings -- "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1281 "if one function is explicitly ended, "
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1282 "so must all the others");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1283 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1284 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1285
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	1286 if (! (curr_lexer->reading_fcn_file \|\| curr_lexer->reading_script_file
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	1287 \|\| (curr_lexer)->input_from_eval_string ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1288 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1289 curr_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	1290 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1291 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1292
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	1293 if (curr_lexer->reading_classdef_file)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1294 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1295 curr_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	1296 YYABORT;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1297 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1298
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1299 $$ = curr_parser.make_end ("endfunction",
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1300 curr_lexer->input_line_number,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1301 curr_lexer->current_input_column);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1302 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1303 ;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1304
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1305 // =============
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1306 // Classdef file
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1307 // =============
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1308
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1309 classdef_file : CLASSDEF_FILE classdef opt_sep END_OF_INPUT
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1310 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1311 curr_parser->classdef_object = $2;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1312 $$ = 0;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1313 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1314 ;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1315
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1316 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1317 // Classdef
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1318 // ========
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1319
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1320 classdef_beg : CLASSDEF
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1321 {
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1322 if (! reading_classdef_file)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1323 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1324 curr_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	1325 YYABORT;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1326 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1327
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1328 curr_lexer->parsing_classdef = true;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1329 $$ = $1;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1330 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1331 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1332
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1333 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	1334 {
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	1335 curr_lexer->parsing_classdef = false;
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	1336 <<<<<<< local
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1337 if (! ($$ = curr_parser->make_classdef ($1, $3, $4, $5, $7, $9, $2)))
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	1338 =======
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1339
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1340 if (curr_parser.end_token_ok ($1, token::classdef_end))
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1341 $$ = curr_parser.make_end ("endclassdef", $1->line (), $1->column ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1342 else
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	1343 >>>>>>> other
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1344 ABORT_PARSE;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1345 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1346 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1347
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1348 opt_attr_list : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1349 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1350 \| '(' attr_list ')'
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1351 { $$ = $2; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1352 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1353
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1354 attr_list : attr
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1355 { $$ = new tree_classdef_attribute_list ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1356 \| attr_list ',' attr
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1357 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1358 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1359 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 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 attr : identifier
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1364 { $$ = new tree_classdef_attribute ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1365 \| identifier '=' decl_param_init expression
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1366 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1367 curr_lexer->looking_at_initializer_expression = false;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1368 $$ = new tree_classdef_attribute ($1, $4);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1369 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1370 \| EXPR_NOT identifier
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1371 { $$ = new tree_classdef_attribute ($2, false); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1372 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1373
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1374 opt_superclass_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1375 : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1376 { $$ = 0; }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1377 \| superclass_list
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1378 { $$ = $1; }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1379 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1380
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1381 superclass_list : EXPR_LT superclass
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1382 { $$ = new tree_classdef_superclass_list ($2); }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1383 \| superclass_list EXPR_AND superclass
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1384 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1385 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1386 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1387 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1388 ;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1389
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1390 superclass : identifier
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1391 { $$ = new tree_classdef_superclass ($1); }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1392 \| identifier '.' identifier
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1393 { $$ = new tree_classdef_superclass ($3, $1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1394 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1395
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1396 class_body : properties_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1397 { $$ = new tree_classdef_body ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1398 \| methods_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1399 { $$ = new tree_classdef_body ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1400 \| events_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1401 { $$ = new tree_classdef_body ($1); }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1402 \| enum_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1403 { $$ = new 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	1404 \| class_body opt_sep properties_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1405 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1406 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1407 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1408 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1409 \| class_body opt_sep methods_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1410 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1411 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1412 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1413 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1414 \| class_body opt_sep events_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1415 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1416 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1417 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1418 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1419 \| class_body opt_sep enum_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1420 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1421 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1422 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1423 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1424 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1425
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1426 properties_block
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1427 : 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	1428 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1429 if (! ($$ = curr_parser->make_classdef_properties_block
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1430 ($1, $3, $5, $7, $2)))
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1431 ABORT_PARSE;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1432 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1433 ;
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1434
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1435 property_list
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1436 : class_property
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1437 { $$ = new tree_classdef_property_list ($1); }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1438 \| property_list opt_sep class_property
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1439 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1440 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1441 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1442 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1443 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1444
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1445 class_property : identifier
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1446 { $$ = new tree_classdef_property ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1447 \| identifier '=' decl_param_init expression ';'
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1448 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1449 curr_lexer->looking_at_initializer_expression = false;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1450 $$ = new tree_classdef_property ($1, $4);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1451 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1452 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1453
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1454 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	1455 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1456 if (! ($$ = curr_parser->make_classdef_methods_block
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1457 ($1, $3, $5, $7, $2)))
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1458 ABORT_PARSE;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1459 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1460 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1461
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1462 methods_list : function
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1463 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1464 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1465 if ($1)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1466 fcn = $1->function ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1467 delete $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1468 $$ = new tree_classdef_methods_list (fcn);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1469 }
13250 f6bbdea030b2 use opt_sep instead of literal '\n' in parser rules for classdef John W. Eaton <jwe@octave.org> parents: 13249 diff changeset	1470 \| methods_list opt_sep function
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1471 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1472 octave_value fcn;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1473 if ($3)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1474 fcn = $3->function ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1475 delete $3;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1476
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1477 $1->append (fcn);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1478 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1479 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1480 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1481
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1482 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	1483 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1484 if (! ($$ = curr_parser->make_classdef_events_block
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1485 ($1, $3, $5, $7, $2)))
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1486 ABORT_PARSE;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1487 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1488 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1489
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1490 events_list : class_event
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1491 { $$ = new 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	1492 \| events_list opt_sep class_event
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1493 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1494 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1495 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1496 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1497 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1498
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1499 class_event : identifier
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1500 { $$ = new tree_classdef_event ($1); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1501 ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1502
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1503 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	1504 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1505 if (! ($$ = curr_parser->make_classdef_enum_block
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	1506 ($1, $3, $5, $7, $2)))
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1507 ABORT_PARSE;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1508 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1509 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1510
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1511 enum_list : class_enum
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1512 { $$ = new 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	1513 \| enum_list opt_sep class_enum
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1514 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1515 $1->append ($3);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1516 $$ = $1;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1517 }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1518 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1519
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1520 class_enum : identifier '(' expression ')'
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	1521 { $$ = new tree_classdef_enum ($1, $3); }
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1522 ;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1523
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1524 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1525 // Miscellaneous
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1526 // =============
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1527
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1528 stash_comment : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1529 { $$ = octave_comment_buffer::get_comment (); }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1530 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1531
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1532 parse_error : LEXICAL_ERROR
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1533 { curr_parser.bison_error ("parse error"); }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1534 \| error
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1535 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1536
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1537 sep_no_nl : ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1538 { $$ = ','; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1539 \| ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1540 { $$ = ';'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1541 \| sep_no_nl ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1542 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1543 \| sep_no_nl ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1544 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1545 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1546
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1547 opt_sep_no_nl : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1548 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1549 \| sep_no_nl
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1550 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1551 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1552
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1553 opt_nl : // empty
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1554 { $$ = 0; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1555 \| nl
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1556 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1557 ;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1558
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1559 nl : '\n'
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1560 { $$ = '\n'; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1561 \| nl '\n'
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1562 { $$ = $1; }
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1563 ;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1564
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1565 sep : ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1566 { $$ = ','; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1567 \| ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1568 { $$ = ';'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1569 \| '\n'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1570 { $$ = '\n'; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1571 \| sep ','
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1572 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1573 \| sep ';'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1574 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1575 \| sep '\n'
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1576 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1577 ;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1578
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1579 opt_sep : // empty
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1580 { $$ = 0; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1581 \| sep
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1582 { $$ = $1; }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1583 ;
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	1584
14533 e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	1585 opt_comma : // empty
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	1586 { $$ = 0; }
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	1587 \| ','
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	1588 { $$ = ','; }
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	1589 ;
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	1590
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1591 %%
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1592
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1593 // Generic error messages.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1594
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	1595 #undef curr_lexer
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	1596
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1597 static void
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1598 yyerror (octave_parser& curr_parser, const char *s)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1599 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1600 curr_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	1601 }
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	1602
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1603 octave_parser::~octave_parser (void)
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1604 {
16167 22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1605 #if defined (OCTAVE_USE_PUSH_PARSER)
22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1606 yypstate_delete (static_cast<yypstate *> (parser_state));
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1607 #endif
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1608
16177 a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1609 delete stmt_list;
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1610
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1611 delete curr_lexer;
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1612 }
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1613 void octave_parser::init (void)
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1614 {
16167 22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1615 #if defined (OCTAVE_USE_PUSH_PARSER)
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1616 parser_state = yypstate_new ();
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1617 #endif
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1618
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1619 CURR_LEXER = curr_lexer;
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1620 }
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1621
16177 a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1622 void
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1623 octave_parser::reset (void)
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1624 {
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1625 delete stmt_list;
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1626
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1627 stmt_list = 0;
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1628
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1629 curr_lexer->reset ();
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1630 }
a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	1631
16138 284e2ca86ef7 execute parser using member function of octave_parser class John W. Eaton <jwe@octave.org> parents: 16136 diff changeset	1632 int
284e2ca86ef7 execute parser using member function of octave_parser class John W. Eaton <jwe@octave.org> parents: 16136 diff changeset	1633 octave_parser::run (void)
284e2ca86ef7 execute parser using member function of octave_parser class John W. Eaton <jwe@octave.org> parents: 16136 diff changeset	1634 {
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1635 int status = 0;
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1636
16167 22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1637 #if defined (OCTAVE_USE_PUSH_PARSER)
22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1638
22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1639 do
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1640 {
16167 22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1641 YYSTYPE lval;
22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1642
22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1643 int token = octave_lex (&lval, scanner);
22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1644
22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1645 yypstate pstate = static_cast<yypstate > (parser_state);
22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1646
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1647 status = octave_push_parse (pstate, token, &lval, *this);
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1648 }
16167 22bb3aa9f025 make push parser interface partially work John W. Eaton <jwe@octave.org> parents: 16164 diff changeset	1649 while (status == YYPUSH_MORE);
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1650
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1651 #else
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1652
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	1653 status = octave_parse (*this);
16157 335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1654
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1655 #endif
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1656
335041cc657a optionally use push parser interface John W. Eaton <jwe@octave.org> parents: 16153 diff changeset	1657 return status;
16138 284e2ca86ef7 execute parser using member function of octave_parser class John W. Eaton <jwe@octave.org> parents: 16136 diff changeset	1658 }
284e2ca86ef7 execute parser using member function of octave_parser class John W. Eaton <jwe@octave.org> parents: 16136 diff changeset	1659
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1660 // Error mesages for mismatched end tokens.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1661
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1662 void
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1663 octave_parser::end_error (const char *type, token::end_tok_type ettype,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1664 int l, int c)
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1665 {
2805 68e6d0c93fc8 [project @ 1997-03-11 04:52:44 by jwe] jwe parents: 2791 diff changeset	1666 static const char *fmt
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	1667 = "'%s' command matched by '%s' near line %d column %d";
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1668
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1669 switch (ettype)
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1670 {
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1671 case token::simple_end:
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1672 error (fmt, type, "end", l, c);
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1673 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	1674
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1675 case token::for_end:
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1676 error (fmt, type, "endfor", l, c);
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1677 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	1678
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1679 case token::function_end:
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1680 error (fmt, type, "endfunction", l, c);
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1681 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	1682
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1683 case token::classdef_end:
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1684 error (fmt, type, "endclassdef", l, c);
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1685 break;
d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 9474 diff changeset	1686
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1687 case token::if_end:
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1688 error (fmt, type, "endif", l, c);
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1689 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	1690
3233 98d0ee053ba4 [project @ 1999-01-27 20:23:40 by jwe] jwe parents: 3216 diff changeset	1691 case token::switch_end:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1692 error (fmt, type, "endswitch", l, c);
3233 98d0ee053ba4 [project @ 1999-01-27 20:23:40 by jwe] jwe parents: 3216 diff changeset	1693 break;
98d0ee053ba4 [project @ 1999-01-27 20:23:40 by jwe] jwe parents: 3216 diff changeset	1694
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1695 case token::while_end:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1696 error (fmt, type, "endwhile", l, c);
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1697 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	1698
5400 c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe] jwe parents: 5397 diff changeset	1699 case token::try_catch_end:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1700 error (fmt, type, "end_try_catch", l, c);
5400 c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe] jwe parents: 5397 diff changeset	1701 break;
c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe] jwe parents: 5397 diff changeset	1702
1371 766af9ca8edb [project @ 1995-09-06 21:36:02 by jwe] jwe parents: 1351 diff changeset	1703 case token::unwind_protect_end:
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1704 error (fmt, type, "end_unwind_protect", l, c);
1371 766af9ca8edb [project @ 1995-09-06 21:36:02 by jwe] jwe parents: 1351 diff changeset	1705 break;
766af9ca8edb [project @ 1995-09-06 21:36:02 by jwe] jwe parents: 1351 diff changeset	1706
496 e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1707 default:
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1708 panic_impossible ();
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1709 break;
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1710 }
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1711 }
e7c5b23b34d3 [project @ 1994-07-06 15:02:26 by jwe] jwe parents: 482 diff changeset	1712
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1713 // Check to see that end tokens are properly matched.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1714
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1715 bool
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1716 octave_parser::end_token_ok (token *tok, token::end_tok_type expected)
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1717 {
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1718 bool retval = true;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1719
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1720 token::end_tok_type ettype = tok->ettype ();
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1721
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1722 if (ettype != expected && ettype != token::simple_end)
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1723 {
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1724 retval = false;
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1725
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	1726 bison_error ("parse error");
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1727
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1728 int l = tok->line ();
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1729 int c = tok->column ();
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1730
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1731 switch (expected)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1732 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1733 case token::classdef_end:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1734 end_error ("classdef", ettype, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1735 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1736
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1737 case token::for_end:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1738 end_error ("for", ettype, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1739 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1740
13249 7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1741 case token::enumeration_end:
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1742 end_error ("enumeration", ettype, l, c);
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1743 break;
7861a5fd3479 accept enumeration keyword John W. Eaton <jwe@octave.org> parents: 13246 diff changeset	1744
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1745 case token::function_end:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1746 end_error ("function", ettype, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1747 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1748
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1749 case token::if_end:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1750 end_error ("if", ettype, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1751 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1752
13246 0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1753 case token::parfor_end:
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1754 end_error ("parfor", ettype, l, c);
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1755 break;
0c69a564f2be additional parfor changes John W. Eaton <jwe@octave.org> parents: 13245 diff changeset	1756
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1757 case token::try_catch_end:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1758 end_error ("try", ettype, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1759 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1760
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1761 case token::switch_end:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1762 end_error ("switch", ettype, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1763 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1764
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1765 case token::unwind_protect_end:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1766 end_error ("unwind_protect", ettype, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1767 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1768
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1769 case token::while_end:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1770 end_error ("while", ettype, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1771 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1772
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1773 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1774 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1775 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1776 }
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1777 }
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1778
5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	1779 return retval;
143 7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1780 }
7849db4b6dbc [project @ 1993-10-04 02:36:45 by jwe] jwe parents: 118 diff changeset	1781
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1782 // Maybe print a warning if an assignment expression is used as the
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1783 // test in a logical expression.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	1784
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1785 void
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1786 octave_parser::maybe_warn_assign_as_truth_value (tree_expression *expr)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1787 {
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	1788 if (expr->is_assignment_expression ()
2961 8a77d52c9d02 [project @ 1997-05-12 01:36:04 by jwe] jwe parents: 2960 diff changeset	1789 && expr->paren_count () < 2)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1790 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1791 if (curr_lexer->fcn_file_full_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1792 warning_with_id
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1793 ("Octave:assign-as-truth-value",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1794 "suggest parenthesis around assignment used as truth value");
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	1795 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1796 warning_with_id
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1797 ("Octave:assign-as-truth-value",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	1798 "suggest parenthesis around assignment used as truth value near line %d, column %d in file '%s'",
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1799 expr->line (), expr->column (), curr_lexer->fcn_file_full_name.c_str ());
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1800 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1801 }
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	1802
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	1803 // Maybe print a warning about switch labels that aren't constants.
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	1804
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1805 void
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1806 octave_parser::maybe_warn_variable_switch_label (tree_expression *expr)
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	1807 {
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	1808 if (! expr->is_constant ())
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	1809 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1810 if (curr_lexer->fcn_file_full_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1811 warning_with_id ("Octave:variable-switch-label",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1812 "variable switch label");
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	1813 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1814 warning_with_id
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1815 ("Octave:variable-switch-label",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	1816 "variable switch label near line %d, column %d in file '%s'",
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	1817 expr->line (), expr->column (), curr_lexer->fcn_file_full_name.c_str ());
8974 fde2a916b2ac include line and file info in parser warnings John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	1818 }
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	1819 }
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	1820
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1821 static tree_expression *
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1822 fold (tree_binary_expression *e)
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1823 {
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 3099 diff changeset	1824 tree_expression *retval = e;
fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 3099 diff changeset	1825
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1826 unwind_protect frame;
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1827
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1828 frame.protect_var (error_state);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1829 frame.protect_var (warning_state);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1830
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1831 frame.protect_var (discard_error_messages);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1832 frame.protect_var (discard_warning_messages);
4452 f3c21a1d1c62 [project @ 2003-07-09 23:20:18 by jwe] jwe parents: 4426 diff changeset	1833
3815 c554ad71bafc [project @ 2001-04-19 19:50:52 by jwe] jwe parents: 3802 diff changeset	1834 discard_error_messages = true;
4452 f3c21a1d1c62 [project @ 2003-07-09 23:20:18 by jwe] jwe parents: 4426 diff changeset	1835 discard_warning_messages = true;
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1836
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1837 tree_expression *op1 = e->lhs ();
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1838 tree_expression *op2 = e->rhs ();
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1839
13844 e48529b3dbd4 eliminate warnings for changes in operator precedence made years ago John W. Eaton <jwe@octave.org> parents: 13250 diff changeset	1840 if (op1->is_constant () && op2->is_constant ())
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1841 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	1842 octave_value tmp = e->rvalue1 ();
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1843
3489 cbee5fbb696d [project @ 2000-01-28 09:14:32 by jwe] jwe parents: 3485 diff changeset	1844 if (! (error_state \|\| warning_state))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1845 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1846 tree_constant *tc_retval
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1847 = new tree_constant (tmp, op1->line (), op1->column ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1848
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1849 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1850
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1851 tree_print_code tpc (buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1852
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1853 e->accept (tpc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1854
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1855 tc_retval->stash_original_text (buf.str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1856
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1857 delete e;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1858
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1859 retval = tc_retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1860 }
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1861 }
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 3099 diff changeset	1862
3292 ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1863 return retval;
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1864 }
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1865
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1866 static tree_expression *
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1867 fold (tree_unary_expression *e)
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1868 {
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1869 tree_expression *retval = e;
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1870
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1871 unwind_protect frame;
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1872
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1873 frame.protect_var (error_state);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1874 frame.protect_var (warning_state);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1875
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1876 frame.protect_var (discard_error_messages);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1877 frame.protect_var (discard_warning_messages);
4452 f3c21a1d1c62 [project @ 2003-07-09 23:20:18 by jwe] jwe parents: 4426 diff changeset	1878
3815 c554ad71bafc [project @ 2001-04-19 19:50:52 by jwe] jwe parents: 3802 diff changeset	1879 discard_error_messages = true;
4452 f3c21a1d1c62 [project @ 2003-07-09 23:20:18 by jwe] jwe parents: 4426 diff changeset	1880 discard_warning_messages = true;
3292 ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1881
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1882 tree_expression *op = e->operand ();
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1883
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1884 if (op->is_constant ())
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1885 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	1886 octave_value tmp = e->rvalue1 ();
3292 ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1887
3489 cbee5fbb696d [project @ 2000-01-28 09:14:32 by jwe] jwe parents: 3485 diff changeset	1888 if (! (error_state \|\| warning_state))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1889 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1890 tree_constant *tc_retval
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1891 = new tree_constant (tmp, op->line (), op->column ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1892
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1893 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1894
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1895 tree_print_code tpc (buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1896
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1897 e->accept (tpc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1898
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1899 tc_retval->stash_original_text (buf.str ());
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 delete e;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1902
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1903 retval = tc_retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1904 }
3292 ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1905 }
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	1906
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1907 return retval;
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1908 }
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1909
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1910 // Finish building a range.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1911
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1912 tree_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1913 octave_parser::finish_colon_expression (tree_colon_expression *e)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1914 {
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 3099 diff changeset	1915 tree_expression *retval = e;
fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 3099 diff changeset	1916
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1917 unwind_protect frame;
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1918
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1919 frame.protect_var (error_state);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1920 frame.protect_var (warning_state);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1921
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1922 frame.protect_var (discard_error_messages);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	1923 frame.protect_var (discard_warning_messages);
4452 f3c21a1d1c62 [project @ 2003-07-09 23:20:18 by jwe] jwe parents: 4426 diff changeset	1924
3815 c554ad71bafc [project @ 2001-04-19 19:50:52 by jwe] jwe parents: 3802 diff changeset	1925 discard_error_messages = true;
4452 f3c21a1d1c62 [project @ 2003-07-09 23:20:18 by jwe] jwe parents: 4426 diff changeset	1926 discard_warning_messages = true;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1927
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1928 tree_expression *base = e->base ();
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1929 tree_expression *limit = e->limit ();
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1930 tree_expression *incr = e->increment ();
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1931
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1932 if (base)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1933 {
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	1934 if (limit)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1935 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1936 if (base->is_constant () && limit->is_constant ()
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1937 && (! incr \|\| (incr && incr->is_constant ())))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1938 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1939 octave_value tmp = e->rvalue1 ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1940
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1941 if (! (error_state \|\| warning_state))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1942 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1943 tree_constant *tc_retval
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1944 = new tree_constant (tmp, base->line (), base->column ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1945
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1946 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1947
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1948 tree_print_code tpc (buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1949
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1950 e->accept (tpc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1951
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1952 tc_retval->stash_original_text (buf.str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1953
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1954 delete e;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1955
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1956 retval = tc_retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1957 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1958 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1959 }
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1960 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1961 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1962 e->preserve_base ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1963 delete e;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1964
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1965 // FIXME -- need to attempt constant folding here
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1966 // too (we need a generic way to do that).
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1967 retval = base;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1968 }
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1969 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1970
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1971 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1972 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	1973
1607 795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1974 // Make a constant.
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1975
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1976 tree_constant *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	1977 octave_parser::make_constant (int op, token *tok_val)
1607 795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1978 {
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1979 int l = tok_val->line ();
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1980 int c = tok_val->column ();
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1981
3216 60a89a69a70a [project @ 1998-11-11 20:47:03 by jwe] jwe parents: 3208 diff changeset	1982 tree_constant *retval = 0;
1607 795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1983
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1984 switch (op)
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1985 {
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1986 case NUM:
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1987 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1988 octave_value tmp (tok_val->number ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1989 retval = new tree_constant (tmp, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1990 retval->stash_original_text (tok_val->text_rep ());
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	1991 }
1607 795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1992 break;
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1993
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1994 case IMAG_NUM:
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1995 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1996 octave_value tmp (Complex (0.0, tok_val->number ()));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1997 retval = new tree_constant (tmp, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	1998 retval->stash_original_text (tok_val->text_rep ());
1607 795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	1999 }
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2000 break;
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2001
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5189 diff changeset	2002 case DQ_STRING:
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5189 diff changeset	2003 case SQ_STRING:
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2004 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2005 std::string txt = tok_val->text ();
7699 27a5f578750c make_constant: handle escape sequences in dq-strings John W. Eaton <jwe@octave.org> parents: 7690 diff changeset	2006
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2007 char delim = op == DQ_STRING ? '"' : '\'';
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2008 octave_value tmp (txt, delim);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2009
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2010 if (txt.empty ())
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2011 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2012 if (op == DQ_STRING)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2013 tmp = octave_null_str::instance;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2014 else
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2015 tmp = octave_null_sq_str::instance;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2016 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8064 diff changeset	2017
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2018 retval = new tree_constant (tmp, l, c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2019
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2020 if (op == DQ_STRING)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2021 txt = undo_string_escapes (txt);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2022
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2023 // FIXME -- maybe this should also be handled by
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2024 // tok_val->text_rep () for character strings?
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2025 retval->stash_original_text (delim + txt + delim);
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2026 }
1607 795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2027 break;
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2028
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2029 default:
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2030 panic_impossible ();
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2031 break;
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2032 }
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2033
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2034 return retval;
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2035 }
795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	2036
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2037 // Make a function handle.
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2038
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2039 tree_fcn_handle *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2040 octave_parser::make_fcn_handle (token *tok_val)
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2041 {
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2042 int l = tok_val->line ();
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2043 int c = tok_val->column ();
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2044
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2045 tree_fcn_handle *retval = new tree_fcn_handle (tok_val->text (), l, c);
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2046
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2047 return retval;
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2048 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	2049
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2050 // Make an anonymous function handle.
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2051
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2052 tree_anon_fcn_handle *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2053 octave_parser::make_anon_fcn_handle (tree_parameter_list *param_list,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2054 tree_statement *stmt)
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2055 {
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5774 diff changeset	2056 // FIXME -- need to get these from the location of the @ symbol.
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2057 int l = curr_lexer->input_line_number;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2058 int c = curr_lexer->current_input_column;
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2059
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2060 tree_parameter_list *ret_list = 0;
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2061
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	2062 symbol_table::scope_id fcn_scope = symbol_table::current_scope ();
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	2063
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	2064 if (parser_symtab_context.empty ())
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	2065 panic_impossible ();
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	2066
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	2067 parser_symtab_context.pop ();
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	2068
7351 8470a6b0b769 [project @ 2008-01-07 17:57:24 by jwe] jwe parents: 7336 diff changeset	2069 stmt->set_print_flag (false);
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2070
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2071 tree_statement_list *body = new tree_statement_list (stmt);
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2072
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2073 body->mark_as_anon_function_body ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2074
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5848 diff changeset	2075 tree_anon_fcn_handle *retval
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	2076 = new tree_anon_fcn_handle (param_list, ret_list, body, fcn_scope, l, c);
13125 34a49d076155 Show row/column for anonymous functions in the profiler Daniel Kraft <d@domob.eu> parents: 13029 diff changeset	2077 // FIXME: Stash the filename. This does not work and produces
34a49d076155 Show row/column for anonymous functions in the profiler Daniel Kraft <d@domob.eu> parents: 13029 diff changeset	2078 // errors when executed.
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2079 //retval->stash_file_name (curr_lexer->fcn_file_name);
4935 4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2080
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2081 return retval;
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2082 }
4fc993a4e072 [project @ 2004-08-06 03:17:12 by jwe] jwe parents: 4930 diff changeset	2083
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2084 // Build a binary expression.
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2085
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2086 tree_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2087 octave_parser::make_binary_op (int op, tree_expression op1, token tok_val,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2088 tree_expression *op2)
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2089 {
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2090 octave_value::binary_op t = octave_value::unknown_binary_op;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2091
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2092 switch (op)
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2093 {
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2094 case POW:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2095 t = octave_value::op_pow;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2096 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2097
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2098 case EPOW:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2099 t = octave_value::op_el_pow;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2100 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2101
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2102 case '+':
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2103 t = octave_value::op_add;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2104 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2105
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2106 case '-':
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2107 t = octave_value::op_sub;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2108 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2109
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2110 case '*':
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2111 t = octave_value::op_mul;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2112 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2113
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2114 case '/':
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2115 t = octave_value::op_div;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2116 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2117
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2118 case EMUL:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2119 t = octave_value::op_el_mul;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2120 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2121
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2122 case EDIV:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2123 t = octave_value::op_el_div;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2124 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2125
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2126 case LEFTDIV:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2127 t = octave_value::op_ldiv;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2128 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2129
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2130 case ELEFTDIV:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2131 t = octave_value::op_el_ldiv;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2132 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2133
2899 0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2134 case LSHIFT:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2135 t = octave_value::op_lshift;
2899 0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2136 break;
0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2137
0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2138 case RSHIFT:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2139 t = octave_value::op_rshift;
2899 0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2140 break;
0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2141
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2142 case EXPR_LT:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2143 t = octave_value::op_lt;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2144 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2145
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2146 case EXPR_LE:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2147 t = octave_value::op_le;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2148 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2149
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2150 case EXPR_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2151 t = octave_value::op_eq;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2152 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2153
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2154 case EXPR_GE:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2155 t = octave_value::op_ge;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2156 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2157
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2158 case EXPR_GT:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2159 t = octave_value::op_gt;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2160 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2161
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2162 case EXPR_NE:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2163 t = octave_value::op_ne;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2164 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2165
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2166 case EXPR_AND:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2167 t = octave_value::op_el_and;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2168 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2169
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2170 case EXPR_OR:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2171 t = octave_value::op_el_or;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2172 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2173
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2174 default:
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2175 panic_impossible ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2176 break;
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2177 }
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2178
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2179 int l = tok_val->line ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2180 int c = tok_val->column ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2181
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	2182 tree_binary_expression *e
7800 5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7787 diff changeset	2183 = maybe_compound_binary_expression (op1, op2, l, c, t);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2184
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	2185 return fold (e);
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2186 }
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2187
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2188 // Build a boolean expression.
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2189
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2190 tree_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2191 octave_parser::make_boolean_op (int op, tree_expression op1, token tok_val,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2192 tree_expression *op2)
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2193 {
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2194 tree_boolean_expression::type t;
7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2195
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2196 switch (op)
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2197 {
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2198 case EXPR_AND_AND:
2805 68e6d0c93fc8 [project @ 1997-03-11 04:52:44 by jwe] jwe parents: 2791 diff changeset	2199 t = tree_boolean_expression::bool_and;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2200 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2201
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2202 case EXPR_OR_OR:
2805 68e6d0c93fc8 [project @ 1997-03-11 04:52:44 by jwe] jwe parents: 2791 diff changeset	2203 t = tree_boolean_expression::bool_or;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2204 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2205
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2206 default:
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2207 panic_impossible ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2208 break;
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2209 }
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2210
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2211 int l = tok_val->line ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2212 int c = tok_val->column ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2213
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	2214 tree_boolean_expression *e
987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	2215 = new tree_boolean_expression (op1, op2, l, c, t);
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2216
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	2217 return fold (e);
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2218 }
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2219
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2220 // Build a prefix expression.
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2221
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2222 tree_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2223 octave_parser::make_prefix_op (int op, tree_expression op1, token tok_val)
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2224 {
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3195 diff changeset	2225 octave_value::unary_op t = octave_value::unknown_unary_op;
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2226
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2227 switch (op)
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2228 {
2960 194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2229 case EXPR_NOT:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2230 t = octave_value::op_not;
2960 194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2231 break;
194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2232
4965 c0d8e8afa82f [project @ 2004-09-06 20:19:57 by jwe] jwe parents: 4935 diff changeset	2233 case '+':
c0d8e8afa82f [project @ 2004-09-06 20:19:57 by jwe] jwe parents: 4935 diff changeset	2234 t = octave_value::op_uplus;
c0d8e8afa82f [project @ 2004-09-06 20:19:57 by jwe] jwe parents: 4935 diff changeset	2235 break;
c0d8e8afa82f [project @ 2004-09-06 20:19:57 by jwe] jwe parents: 4935 diff changeset	2236
2960 194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2237 case '-':
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2238 t = octave_value::op_uminus;
2960 194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2239 break;
194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2240
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2241 case PLUS_PLUS:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2242 t = octave_value::op_incr;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2243 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2244
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2245 case MINUS_MINUS:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2246 t = octave_value::op_decr;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2247 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2248
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2249 default:
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2250 panic_impossible ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2251 break;
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2252 }
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2253
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2254 int l = tok_val->line ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2255 int c = tok_val->column ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2256
3292 ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	2257 tree_prefix_expression *e
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	2258 = new tree_prefix_expression (op1, l, c, t);
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	2259
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	2260 return fold (e);
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2261 }
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2262
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2263 // Build a postfix expression.
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2264
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2265 tree_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2266 octave_parser::make_postfix_op (int op, tree_expression op1, token tok_val)
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2267 {
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3195 diff changeset	2268 octave_value::unary_op t = octave_value::unknown_unary_op;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2269
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2270 switch (op)
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2271 {
2960 194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2272 case QUOTE:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2273 t = octave_value::op_hermitian;
2960 194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2274 break;
194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2275
194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2276 case TRANSPOSE:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2277 t = octave_value::op_transpose;
2960 194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2278 break;
194b50e4725b [project @ 1997-05-12 00:43:54 by jwe] jwe parents: 2899 diff changeset	2279
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2280 case PLUS_PLUS:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2281 t = octave_value::op_incr;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2282 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2283
2375 7ef24992e290 [project @ 1996-10-12 00:39:52 by jwe] jwe parents: 2200 diff changeset	2284 case MINUS_MINUS:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2285 t = octave_value::op_decr;
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2286 break;
777 a2f9d3fd720c [project @ 1994-10-07 14:01:53 by jwe] jwe parents: 773 diff changeset	2287
578 d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2288 default:
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2289 panic_impossible ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2290 break;
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2291 }
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2292
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2293 int l = tok_val->line ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2294 int c = tok_val->column ();
d169be9237fb [project @ 1994-08-03 20:06:54 by jwe] jwe parents: 572 diff changeset	2295
3292 ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	2296 tree_postfix_expression *e
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	2297 = new tree_postfix_expression (op1, l, c, t);
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	2298
ad0d250ebd7e [project @ 1999-10-14 22:52:28 by jwe] jwe parents: 3258 diff changeset	2299 return fold (e);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2300 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2301
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2302 // Build an unwind-protect command.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2303
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2304 tree_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2305 octave_parser::make_unwind_command (token *unwind_tok,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2306 tree_statement_list *body,
16136 ed36d5543b27 don't declare octave_parser member functions static John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	2307 tree_statement_list *cleanup_stmts,
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2308 token *end_tok,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2309 octave_comment_list *lc,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2310 octave_comment_list *mc)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2311 {
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2312 tree_command *retval = 0;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2313
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2314 if (end_token_ok (end_tok, token::unwind_protect_end))
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2315 {
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2316 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2317
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2318 int l = unwind_tok->line ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2319 int c = unwind_tok->column ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2320
16136 ed36d5543b27 don't declare octave_parser member functions static John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	2321 retval = new tree_unwind_protect_command (body, cleanup_stmts,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2322 lc, mc, tc, l, c);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2323 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2324
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2325 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2326 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2327
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2328 // Build a try-catch command.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2329
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2330 tree_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2331 octave_parser::make_try_command (token try_tok, tree_statement_list body,
16136 ed36d5543b27 don't declare octave_parser member functions static John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	2332 tree_statement_list *cleanup_stmts,
ed36d5543b27 don't declare octave_parser member functions static John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	2333 token *end_tok,
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2334 octave_comment_list *lc,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2335 octave_comment_list *mc)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2336 {
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2337 tree_command *retval = 0;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2338
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2339 if (end_token_ok (end_tok, token::try_catch_end))
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2340 {
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2341 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2342
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2343 int l = try_tok->line ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2344 int c = try_tok->column ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2345
16136 ed36d5543b27 don't declare octave_parser member functions static John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	2346 retval = new tree_try_catch_command (body, cleanup_stmts,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2347 lc, mc, tc, l, c);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2348 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2349
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2350 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2351 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2352
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2353 // Build a while command.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2354
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2355 tree_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2356 octave_parser::make_while_command (token while_tok, tree_expression expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2357 tree_statement_list body, token end_tok,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2358 octave_comment_list *lc)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2359 {
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2360 tree_command *retval = 0;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2361
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2362 maybe_warn_assign_as_truth_value (expr);
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2363
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2364 if (end_token_ok (end_tok, token::while_end))
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2365 {
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2366 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2367
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2368 curr_lexer->looping--;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2369
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2370 int l = while_tok->line ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2371 int c = while_tok->column ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2372
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2373 retval = new tree_while_command (expr, body, lc, tc, l, c);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2374 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2375
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2376 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2377 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2378
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2379 // Build a do-until command.
8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2380
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2381 tree_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2382 octave_parser::make_do_until_command (token *until_tok,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2383 tree_statement_list *body,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2384 tree_expression *expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2385 octave_comment_list *lc)
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2386 {
8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2387 tree_command *retval = 0;
8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2388
8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2389 maybe_warn_assign_as_truth_value (expr);
8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2390
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2391 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2392
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2393 curr_lexer->looping--;
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2394
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2395 int l = until_tok->line ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2396 int c = until_tok->column ();
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2397
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2398 retval = new tree_do_until_command (expr, body, lc, tc, l, c);
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2399
8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2400 return retval;
8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2401 }
8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3446 diff changeset	2402
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2403 // Build a for command.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2404
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2405 tree_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2406 octave_parser::make_for_command (int tok_id, token *for_tok,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2407 tree_argument_list *lhs,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2408 tree_expression *expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2409 tree_expression *maxproc,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2410 tree_statement_list body, token end_tok,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2411 octave_comment_list *lc)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2412 {
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2413 tree_command *retval = 0;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2414
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	2415 bool parfor = tok_id == PARFOR;
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	2416
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	2417 if (end_token_ok (end_tok, parfor ? token::parfor_end : token::for_end))
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2418 {
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2419 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2420
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2421 curr_lexer->looping--;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2422
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2423 int l = for_tok->line ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2424 int c = for_tok->column ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2425
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2426 if (lhs->length () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2427 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2428 tree_expression *tmp = lhs->remove_front ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2429
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	2430 retval = new tree_simple_for_command (parfor, tmp, expr, maxproc,
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	2431 body, lc, tc, l, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2432
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2433 delete lhs;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2434 }
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2435 else
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	2436 {
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	2437 if (parfor)
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	2438 bison_error ("invalid syntax for parfor statement");
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	2439 else
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	2440 retval = new tree_complex_for_command (lhs, expr, body,
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	2441 lc, tc, l, c);
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now John W. Eaton <jwe@octave.org> parents: 13241 diff changeset	2442 }
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2443 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2444
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2445 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2446 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2447
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2448 // Build a break command.
fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2449
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2450 tree_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2451 octave_parser::make_break_command (token *break_tok)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2452 {
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2453 tree_command *retval = 0;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2454
2620 5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2455 int l = break_tok->line ();
5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2456 int c = break_tok->column ();
5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2457
10188 97ae300aa73a improve implementation of break, continue, and return commands John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2458 retval = new tree_break_command (l, c);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2459
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2460 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2461 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2462
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2463 // Build a continue command.
fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2464
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2465 tree_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2466 octave_parser::make_continue_command (token *continue_tok)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2467 {
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2468 tree_command *retval = 0;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2469
2620 5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2470 int l = continue_tok->line ();
5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2471 int c = continue_tok->column ();
5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2472
10188 97ae300aa73a improve implementation of break, continue, and return commands John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2473 retval = new tree_continue_command (l, c);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2474
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2475 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2476 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2477
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2478 // Build a return command.
fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2479
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2480 tree_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2481 octave_parser::make_return_command (token *return_tok)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2482 {
4207 fa3482b34599 [project @ 2002-12-03 18:22:05 by jwe] jwe parents: 4186 diff changeset	2483 tree_command *retval = 0;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2484
2620 5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2485 int l = return_tok->line ();
5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2486 int c = return_tok->column ();
5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2542 diff changeset	2487
10188 97ae300aa73a improve implementation of break, continue, and return commands John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2488 retval = new tree_return_command (l, c);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2489
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2490 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2491 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2492
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2493 // Start an if command.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2494
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2495 tree_if_command_list *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2496 octave_parser::start_if_command (tree_expression *expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2497 tree_statement_list *list)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2498 {
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2499 maybe_warn_assign_as_truth_value (expr);
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2500
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2501 tree_if_clause *t = new tree_if_clause (expr, list);
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2502
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2503 return new tree_if_command_list (t);
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2504 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2505
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2506 // Finish an if command.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2507
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2508 tree_if_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2509 octave_parser::finish_if_command (token if_tok, tree_if_command_list list,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2510 token end_tok, octave_comment_list lc)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2511 {
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2512 tree_if_command *retval = 0;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2513
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2514 if (end_token_ok (end_tok, token::if_end))
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2515 {
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2516 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2517
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2518 int l = if_tok->line ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2519 int c = if_tok->column ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2520
8842 be7b30a24938 line/column info for switch and if statements John W. Eaton <jwe@octave.org> parents: 8828 diff changeset	2521 if (list && ! list->empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2522 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2523 tree_if_clause *elt = list->front ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2524
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2525 if (elt)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2526 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2527 elt->line (l);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2528 elt->column (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2529 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2530 }
8842 be7b30a24938 line/column info for switch and if statements John W. Eaton <jwe@octave.org> parents: 8828 diff changeset	2531
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2532 retval = new tree_if_command (list, lc, tc, l, c);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2533 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2534
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2535 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2536 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2537
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2538 // Build an elseif clause.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2539
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2540 tree_if_clause *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2541 octave_parser::make_elseif_clause (token elseif_tok, tree_expression expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2542 tree_statement_list *list,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2543 octave_comment_list *lc)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2544 {
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2545 maybe_warn_assign_as_truth_value (expr);
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2546
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2547 int l = elseif_tok->line ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2548 int c = elseif_tok->column ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2549
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2550 return new tree_if_clause (expr, list, lc, l, c);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2551 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2552
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2553 // Finish a switch command.
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2554
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2555 tree_switch_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2556 octave_parser::finish_switch_command (token switch_tok, tree_expression expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2557 tree_switch_case_list *list,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2558 token end_tok, octave_comment_list lc)
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2559 {
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2560 tree_switch_command *retval = 0;
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2561
2857 5448c8cba402 [project @ 1997-03-31 07:06:10 by jwe] jwe parents: 2856 diff changeset	2562 if (end_token_ok (end_tok, token::switch_end))
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2563 {
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2564 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2565
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2566 int l = switch_tok->line ();
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2567 int c = switch_tok->column ();
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2568
8842 be7b30a24938 line/column info for switch and if statements John W. Eaton <jwe@octave.org> parents: 8828 diff changeset	2569 if (list && ! list->empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2570 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2571 tree_switch_case *elt = list->front ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2572
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2573 if (elt)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2574 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2575 elt->line (l);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2576 elt->column (c);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2577 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2578 }
8842 be7b30a24938 line/column info for switch and if statements John W. Eaton <jwe@octave.org> parents: 8828 diff changeset	2579
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2580 retval = new tree_switch_command (expr, list, lc, tc, l, c);
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2581 }
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2582
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2583 return retval;
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2584 }
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2585
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2586 // Build a switch case.
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2587
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2588 tree_switch_case *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2589 octave_parser::make_switch_case (token case_tok, tree_expression expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2590 tree_statement_list *list,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2591 octave_comment_list *lc)
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2592 {
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2593 maybe_warn_variable_switch_label (expr);
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2594
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2595 int l = case_tok->line ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2596 int c = case_tok->column ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2597
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2598 return new tree_switch_case (expr, list, lc, l, c);
2764 2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2599 }
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe] jwe parents: 2745 diff changeset	2600
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2601 // Build an assignment to a variable.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2602
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2603 tree_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2604 octave_parser::make_assign_op (int op, tree_argument_list lhs, token eq_tok,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2605 tree_expression *rhs)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2606 {
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2607 tree_expression *retval = 0;
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2608
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2609 octave_value::assign_op t = octave_value::unknown_assign_op;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2610
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2611 switch (op)
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2612 {
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2613 case '=':
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2614 t = octave_value::op_asn_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2615 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2616
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2617 case ADD_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2618 t = octave_value::op_add_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2619 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2620
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2621 case SUB_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2622 t = octave_value::op_sub_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2623 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2624
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2625 case MUL_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2626 t = octave_value::op_mul_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2627 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2628
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2629 case DIV_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2630 t = octave_value::op_div_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2631 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2632
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2633 case LEFTDIV_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2634 t = octave_value::op_ldiv_eq;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2635 break;
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2636
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	2637 case POW_EQ:
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	2638 t = octave_value::op_pow_eq;
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	2639 break;
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	2640
2899 0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2641 case LSHIFT_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2642 t = octave_value::op_lshift_eq;
2899 0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2643 break;
0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2644
0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2645 case RSHIFT_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2646 t = octave_value::op_rshift_eq;
2899 0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2647 break;
0d79a8c11a2b [project @ 1997-04-30 03:09:23 by jwe] jwe parents: 2891 diff changeset	2648
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2649 case EMUL_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2650 t = octave_value::op_el_mul_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2651 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2652
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2653 case EDIV_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2654 t = octave_value::op_el_div_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2655 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2656
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2657 case ELEFTDIV_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2658 t = octave_value::op_el_ldiv_eq;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2659 break;
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2660
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	2661 case EPOW_EQ:
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	2662 t = octave_value::op_el_pow_eq;
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	2663 break;
a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4009 diff changeset	2664
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2665 case AND_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2666 t = octave_value::op_el_and_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2667 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2668
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2669 case OR_EQ:
3525 6cfa474c5b99 [project @ 2000-02-02 10:48:41 by jwe] jwe parents: 3523 diff changeset	2670 t = octave_value::op_el_or_eq;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2671 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2672
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2673 default:
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2674 panic_impossible ();
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2675 break;
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2676 }
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2677
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2678 int l = eq_tok->line ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2679 int c = eq_tok->column ();
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2680
5841 fb4dea2184bf [project @ 2006-06-05 20:59:25 by jwe] jwe parents: 5832 diff changeset	2681 if (lhs->is_simple_assign_lhs ())
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2682 {
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2683 tree_expression *tmp = lhs->remove_front ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2684
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2685 retval = new tree_simple_assignment (tmp, rhs, false, l, c, t);
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2686
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	2687 delete lhs;
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2688 }
10230 0a5a769b8fc0 disallow computed multiple assignment Jaroslav Hajek <highegg@gmail.com> parents: 10207 diff changeset	2689 else if (t == octave_value::op_asn_eq)
0a5a769b8fc0 disallow computed multiple assignment Jaroslav Hajek <highegg@gmail.com> parents: 10207 diff changeset	2690 return new tree_multi_assignment (lhs, rhs, false, l, c);
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2691 else
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	2692 bison_error ("computed multiple assignment not allowed");
666 fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2693
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2694 return retval;
fb4f6556b443 [project @ 1994-09-06 21:22:46 by jwe] jwe parents: 627 diff changeset	2695 }
751 c9f3cb77478d [project @ 1994-09-30 18:46:17 by jwe] jwe parents: 723 diff changeset	2696
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2697 // Define a script.
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2698
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2699 void
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2700 octave_parser::make_script (tree_statement_list *cmds,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2701 tree_statement *end_script)
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2702 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2703 if (! cmds)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2704 cmds = new tree_statement_list ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2705
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2706 cmds->append (end_script);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2707
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2708 octave_user_script *script
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2709 = new octave_user_script (curr_lexer->fcn_file_full_name,
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2710 curr_lexer->fcn_file_name,
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2711 cmds, curr_lexer->help_text);
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2712
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2713 curr_lexer->help_text = "";
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2714
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2715 octave_time now;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2716
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2717 script->stash_fcn_file_time (now);
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2718
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2719 primary_fcn_ptr = script;
8881 8ed42c679af5 after defining a script or function, clear local variables created for parsing John W. Eaton <jwe@octave.org> parents: 8842 diff changeset	2720
9009 da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2721 // Unmark any symbols that may have been tagged as local variables
da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2722 // while parsing (for example, by force_local_variable in lex.l).
da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2723
da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2724 symbol_table::unmark_forced_variables ();
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2725 }
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2726
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2727 // Begin defining a function.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2728
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2729 octave_user_function *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2730 octave_parser::start_function (tree_parameter_list *param_list,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2731 tree_statement_list *body,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2732 tree_statement *end_fcn_stmt)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2733 {
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	2734 // We'll fill in the return list later.
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	2735
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2736 if (! body)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2737 body = new tree_statement_list ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2738
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2739 body->append (end_fcn_stmt);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2740
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2884 diff changeset	2741 octave_user_function *fcn
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	2742 = new octave_user_function (symbol_table::current_scope (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2743 param_list, 0, body);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2744
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2745 if (fcn)
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2746 {
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2747 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2748
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2749 fcn->stash_trailing_comment (tc);
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2750 }
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3544 diff changeset	2751
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2752 return fcn;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2753 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2754
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2755 tree_statement *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2756 octave_parser::make_end (const std::string& type, int l, int c)
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2757 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2758 return make_statement (new tree_no_op_command (type, l, c));
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2759 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	2760
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2761 // Do most of the work for defining a function.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2762
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2763 octave_user_function *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2764 octave_parser::frob_function (const std::string& fname,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2765 octave_user_function *fcn)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2766 {
4872 fe71c458f438 [project @ 2004-04-21 20:09:32 by jwe] jwe parents: 4844 diff changeset	2767 std::string id_name = fname;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2768
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2769 // If input is coming from a file, issue a warning if the name of
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2770 // the file does not match the name of the function stated in the
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2771 // file. Matlab doesn't provide a diagnostic (it ignores the stated
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2772 // name).
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	2773 if (! autoloading && curr_lexer->reading_fcn_file
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	2774 && curr_fcn_depth == 1 && ! parsing_subfunctions)
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2775 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2776 // FIXME -- should curr_lexer->fcn_file_name already be
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2777 // preprocessed when we get here? It seems to only be a
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2778 // problem with relative file names.
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2779
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2780 std::string nm = curr_lexer->fcn_file_name;
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2781
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2782 size_t pos = nm.find_last_of (file_ops::dir_sep_chars ());
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2783
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2784 if (pos != std::string::npos)
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2785 nm = curr_lexer->fcn_file_name.substr (pos+1);
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2786
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2787 if (nm != id_name)
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2788 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2789 warning_with_id
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2790 ("Octave:function-name-clash",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	2791 "function name '%s' does not agree with function file name '%s'",
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2792 id_name.c_str (), curr_lexer->fcn_file_full_name.c_str ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2793
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2794 id_name = nm;
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2795 }
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2796 }
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2797
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	2798 if (curr_lexer->reading_fcn_file \|\| curr_lexer->reading_classdef_file \|\| autoloading)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2799 {
3712 7066a8065e7e [project @ 2000-08-22 06:21:20 by jwe] jwe parents: 3665 diff changeset	2800 octave_time now;
3162 7c96e85c76db [project @ 1998-04-08 18:19:35 by jwe] jwe parents: 3156 diff changeset	2801
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2802 fcn->stash_fcn_file_name (curr_lexer->fcn_file_full_name);
3162 7c96e85c76db [project @ 1998-04-08 18:19:35 by jwe] jwe parents: 3156 diff changeset	2803 fcn->stash_fcn_file_time (now);
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2804 fcn->mark_as_system_fcn_file ();
3162 7c96e85c76db [project @ 1998-04-08 18:19:35 by jwe] jwe parents: 3156 diff changeset	2805
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 6238 diff changeset	2806 if (fcn_file_from_relative_lookup)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2807 fcn->mark_relative ();
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 6238 diff changeset	2808
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	2809 if (curr_fcn_depth > 1 \|\| parsing_subfunctions)
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7903 diff changeset	2810 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2811 fcn->stash_parent_fcn_name (curr_lexer->fcn_file_name);
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2812
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	2813 if (curr_fcn_depth > 1)
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14584 diff changeset	2814 fcn->stash_parent_fcn_scope (function_scopes[function_scopes.size ()-2]);
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2815 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2816 fcn->stash_parent_fcn_scope (primary_fcn_scope);
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2817 }
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 6238 diff changeset	2818
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2819 if (curr_lexer->parsing_class_method)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2820 {
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	2821 if (curr_class_name == id_name)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2822 fcn->mark_as_class_constructor ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2823 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2824 fcn->mark_as_class_method ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2825
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	2826 fcn->stash_dispatch_class (curr_class_name);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2827 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	2828
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2829 std::string nm = fcn->fcn_file_name ();
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2830
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2831 file_stat fs (nm);
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2832
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2833 if (fs && fs.is_newer (now))
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2834 warning_with_id ("Octave:future-time-stamp",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	2835 "time stamp for '%s' is in the future", nm.c_str ());
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2836 }
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2837 else if (! input_from_tmp_history_file
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2838 && ! curr_lexer->force_script
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	2839 && curr_lexer->reading_script_file
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2840 && curr_lexer->fcn_file_name == id_name)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2841 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	2842 warning ("function '%s' defined within script file '%s'",
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2843 id_name.c_str (), curr_lexer->fcn_file_full_name.c_str ());
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2844 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2845
4872 fe71c458f438 [project @ 2004-04-21 20:09:32 by jwe] jwe parents: 4844 diff changeset	2846 fcn->stash_function_name (id_name);
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2847 fcn->stash_fcn_location (curr_lexer->input_line_number,
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2848 curr_lexer->current_input_column);
4872 fe71c458f438 [project @ 2004-04-21 20:09:32 by jwe] jwe parents: 4844 diff changeset	2849
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2850 if (! curr_lexer->help_text.empty () && curr_fcn_depth == 1
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2851 && ! parsing_subfunctions)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	2852 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2853 fcn->document (curr_lexer->help_text);
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2854
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	2855 curr_lexer->help_text = "";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	2856 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	2857
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	2858 if (curr_lexer->reading_fcn_file && curr_fcn_depth == 1
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2859 && ! parsing_subfunctions)
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2860 primary_fcn_ptr = fcn;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2861
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2862 return fcn;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2863 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2864
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2865 tree_function_def *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2866 octave_parser::finish_function (tree_parameter_list *ret_list,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2867 octave_user_function *fcn,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2868 octave_comment_list *lc)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2869 {
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2870 tree_function_def *retval = 0;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2871
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2872 if (ret_list)
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2873 ret_list->mark_as_formal_parameters ();
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2874
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2875 if (fcn)
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2876 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7755 diff changeset	2877 std::string nm = fcn->name ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7755 diff changeset	2878 std::string file = fcn->fcn_file_name ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7755 diff changeset	2879
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7755 diff changeset	2880 std::string tmp = nm;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7755 diff changeset	2881 if (! file.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2882 tmp += ": " + file;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7755 diff changeset	2883
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7755 diff changeset	2884 symbol_table::cache_name (fcn->scope (), tmp);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7755 diff changeset	2885
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2886 if (lc)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2887 fcn->stash_leading_comment (lc);
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2888
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2889 fcn->define_ret_list (ret_list);
7755 ea9cb4d68dbf avoid installing subfunctions twice John W. Eaton <jwe@octave.org> parents: 7750 diff changeset	2890
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	2891 if (curr_fcn_depth > 1 \|\| parsing_subfunctions)
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2892 {
11461 2b8531a6a3c9 Change mentions of "nested function" to the less misleading "subfunction" David Grundberg <individ@acc.umu.se> parents: 11388 diff changeset	2893 fcn->mark_as_subfunction ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2894
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2895 if (endfunction_found && function_scopes.size () > 1)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2896 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2897 symbol_table::scope_id pscope
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14584 diff changeset	2898 = function_scopes[function_scopes.size ()-2];
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2899
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2900 symbol_table::install_nestfunction (nm, octave_value (fcn),
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2901 pscope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2902 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2903 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2904 symbol_table::install_subfunction (nm, octave_value (fcn),
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2905 primary_fcn_scope);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2906 }
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2907
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	2908 if (curr_fcn_depth == 1 && fcn)
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2909 symbol_table::update_nest (fcn->scope ());
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2910
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	2911 if (! curr_lexer->reading_fcn_file && curr_fcn_depth == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2912 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2913 // We are either reading a script file or defining a function
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2914 // at the command line, so this definition creates a
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2915 // tree_function object that is placed in the parse tree.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2916 // Otherwise, it is just inserted in the symbol table,
14512 e0d66b8b0c63 Avoid double delete for nested functions in commandline Max Brister <max@2bass.com> parents: 14507 diff changeset	2917 // either as a subfunction or nested function (see above),
e0d66b8b0c63 Avoid double delete for nested functions in commandline Max Brister <max@2bass.com> parents: 14507 diff changeset	2918 // or as the primary function for the file, via
e0d66b8b0c63 Avoid double delete for nested functions in commandline Max Brister <max@2bass.com> parents: 14507 diff changeset	2919 // primary_fcn_ptr (see also load_fcn_from_file,,
e0d66b8b0c63 Avoid double delete for nested functions in commandline Max Brister <max@2bass.com> parents: 14507 diff changeset	2920 // parse_fcn_file, and
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2921 // symbol_table::fcn_info::fcn_info_rep::find_user_function).
9761 5f8971be8e12 parse.y (finish_function): retrun function object unless parsing function file John W. Eaton <jwe@octave.org> parents: 9506 diff changeset	2922
5f8971be8e12 parse.y (finish_function): retrun function object unless parsing function file John W. Eaton <jwe@octave.org> parents: 9506 diff changeset	2923 retval = new tree_function_def (fcn);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	2924 }
8282 47a3d2f829e4 clear local symbol table after parsing function John W. Eaton <jwe@octave.org> parents: 8150 diff changeset	2925
9009 da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2926 // Unmark any symbols that may have been tagged as local
da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2927 // variables while parsing (for example, by force_local_variable
da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2928 // in lex.l).
da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2929
da58ec8f62e8 tag bug don't define forced variables John W. Eaton <jwe@octave.org> parents: 8974 diff changeset	2930 symbol_table::unmark_forced_variables (fcn->scope ());
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2931 }
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2932
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	2933 return retval;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2934 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	2935
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2936 void
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	2937 octave_parser::recover_from_parsing_function (void)
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2938 {
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	2939 if (parser_symtab_context.empty ())
3903 1dbe160ea0d1 [project @ 2002-04-23 03:40:25 by jwe] jwe parents: 3883 diff changeset	2940 panic_impossible ();
1dbe160ea0d1 [project @ 2002-04-23 03:40:25 by jwe] jwe parents: 3883 diff changeset	2941
14329 8d1ae996c122 also save and restore symbol table context in parser (bug #35448) John W. Eaton <jwe@octave.org> parents: 14294 diff changeset	2942 parser_symtab_context.pop ();
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2943
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	2944 if (curr_lexer->reading_fcn_file && curr_fcn_depth == 1
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2945 && ! parsing_subfunctions)
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2946 parsing_subfunctions = true;
25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2947
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	2948 curr_fcn_depth--;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14533 diff changeset	2949 function_scopes.pop_back ();
9474 25ed2d6aacf6 Parse nested functions more accurately. David Grundberg <individ@acc.umu.se> parents: 9471 diff changeset	2950
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2951 curr_lexer->defining_func--;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2952 curr_lexer->parsed_function_name.pop ();
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2953 curr_lexer->looking_at_return_list = false;
7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	2954 curr_lexer->looking_at_parameter_list = false;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2955 }
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	2956
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2957 tree_funcall *
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2958 octave_parser::make_superclass_ref (const std::string& method_nm,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2959 const std::string& package_nm,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2960 const std::string& class_nm,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2961 int l, int c)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2962 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2963 octave_value_list args;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2964
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2965 args(2) = class_nm;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2966 args(1) = package_nm;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2967 args(0) = method_nm;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2968
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2969 octave_value fcn
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2970 = symbol_table::find_built_in_function ("__superclass_reference__");
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2971
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2972 return new tree_funcall (fcn, args);
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2973 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2974
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2975 tree_funcall *
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2976 octave_parser::make_meta_class_query (const std::string& package_nm,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2977 const std::string& class_nm,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2978 int l, int c)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2979 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2980 octave_value_list args;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2981
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2982 args(1) = class_nm;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2983 args(0) = package_nm;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2984
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2985 octave_value fcn
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2986 = symbol_table::find_built_in_function ("__meta_class_query__");
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2987
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2988 return new tree_funcall (fcn, args);
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2989 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2990
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2991 // A CLASSDEF block defines a class that has a constructor and other
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2992 // methods, but it is not an executable command. Parsing the block
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2993 // makes some changes in the symbol table (inserting the constructor
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2994 // and methods, and adding to the list of known objects) and creates
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2995 // a parse tree containing meta information about the class.
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2996
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2997 tree_classdef *
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2998 octave_parser::make_classdef (token *tok_val,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	2999 tree_classdef_attribute_list *a,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3000 tree_identifier *id,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3001 tree_classdef_superclass_list *sc,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3002 tree_classdef_body body, token end_tok,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3003 octave_comment_list *lc)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3004 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3005 tree_classdef *retval = 0;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3006
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3007 std::string cls_name = id->name ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3008
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3009 std::string nm = curr_fcn_file_name;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3010
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3011 size_t pos = nm.find_last_of (file_ops::dir_sep_chars ());
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3012
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3013 if (pos != std::string::npos)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3014 nm = curr_fcn_file_name.substr (pos+1);
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3015
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3016 if (nm != cls_name)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3017 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3018 bison_error ("invalid classdef definition, the class name must match the file name");
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3019 return retval;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3020 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3021
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3022 if (end_token_ok (end_tok, token::classdef_end))
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3023 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3024 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3025
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3026 int l = tok_val->line ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3027 int c = tok_val->column ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3028
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3029 retval = new tree_classdef (a, id, sc, body, lc, tc, l, c);
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3030 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3031
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3032 return retval;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3033 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3034
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3035 tree_classdef_properties_block *
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3036 octave_parser::make_classdef_properties_block (token *tok_val,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3037 tree_classdef_attribute_list *a,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3038 tree_classdef_property_list *plist,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3039 token *end_tok,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3040 octave_comment_list *lc)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3041 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3042 tree_classdef_properties_block *retval = 0;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3043
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3044 if (end_token_ok (end_tok, token::properties_end))
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3045 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3046 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3047
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3048 int l = tok_val->line ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3049 int c = tok_val->column ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3050
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3051 retval = new tree_classdef_properties_block (a, plist, lc, tc, l, c);
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3052 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3053
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3054 return retval;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3055 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3056
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3057 tree_classdef_methods_block *
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3058 octave_parser::make_classdef_methods_block (token *tok_val,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3059 tree_classdef_attribute_list *a,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3060 tree_classdef_methods_list *mlist,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3061 token *end_tok,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3062 octave_comment_list *lc)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3063 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3064 tree_classdef_methods_block *retval = 0;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3065
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3066 if (end_token_ok (end_tok, token::methods_end))
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3067 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3068 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3069
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3070 int l = tok_val->line ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3071 int c = tok_val->column ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3072
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3073 retval = new tree_classdef_methods_block (a, mlist, lc, tc, l, c);
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3074 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3075
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3076 return retval;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3077 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3078
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3079 tree_classdef_events_block *
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3080 octave_parser::make_classdef_events_block (token *tok_val,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3081 tree_classdef_attribute_list *a,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3082 tree_classdef_events_list *elist,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3083 token *end_tok,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3084 octave_comment_list *lc)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3085 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3086 tree_classdef_events_block *retval = 0;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3087
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3088 if (end_token_ok (end_tok, token::events_end))
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3089 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3090 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3091
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3092 int l = tok_val->line ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3093 int c = tok_val->column ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3094
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3095 retval = new tree_classdef_events_block (a, elist, lc, tc, l, c);
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3096 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3097
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3098 return retval;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3099 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3100
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3101 tree_classdef_enum_block *
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3102 octave_parser::make_classdef_enum_block (token *tok_val,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3103 tree_classdef_attribute_list *a,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3104 tree_classdef_enum_list *elist,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3105 token *end_tok,
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3106 octave_comment_list *lc)
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3107 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3108 tree_classdef_enum_block *retval = 0;
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3109
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3110 if (end_token_ok (end_tok, token::enumeration_end))
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3111 {
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3112 octave_comment_list *tc = octave_comment_buffer::get_comment ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3113
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3114 int l = tok_val->line ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3115 int c = tok_val->column ();
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3116
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3117 retval = new tree_classdef_enum_block (a, elist, lc, tc, l, c);
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3118 }
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3119
0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3120 return retval;
2883 0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	3121 }
0b3954110c77 [project @ 1997-04-24 09:57:05 by jwe] jwe parents: 2865 diff changeset	3122
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3123 // Make an index expression.
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3124
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3125 tree_index_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3126 octave_parser::make_index_expression (tree_expression *expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3127 tree_argument_list *args, char type)
751 c9f3cb77478d [project @ 1994-09-30 18:46:17 by jwe] jwe parents: 723 diff changeset	3128 {
c9f3cb77478d [project @ 1994-09-30 18:46:17 by jwe] jwe parents: 723 diff changeset	3129 tree_index_expression *retval = 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	3130
10206 37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	3131 if (args && args->has_magic_tilde ())
37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	3132 {
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	3133 bison_error ("invalid use of empty argument (~) in index expression");
10206 37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	3134 return retval;
37a08e0ce2dc support Matlab-style empty output/input arguments Jaroslav Hajek <highegg@gmail.com> parents: 10188 diff changeset	3135 }
751 c9f3cb77478d [project @ 1994-09-30 18:46:17 by jwe] jwe parents: 723 diff changeset	3136
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3137 int l = expr->line ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3138 int c = expr->column ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3139
15954 46ca8488de92 Re-engineer tree_expression postfix handling to make it more flexible. Michael Goffioul <michael.goffioul@gmail.com> parents: 15895 diff changeset	3140 if (! expr->is_postfix_indexed ())
46ca8488de92 Re-engineer tree_expression postfix handling to make it more flexible. Michael Goffioul <michael.goffioul@gmail.com> parents: 15895 diff changeset	3141 expr->set_postfix_index (type);
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3142
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3143 if (expr->is_index_expression ())
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3144 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3145 tree_index_expression tmp = static_cast<tree_index_expression > (expr);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3146
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3147 tmp->append (args, type);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3148
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3149 retval = tmp;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3150 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3151 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3152 retval = new tree_index_expression (expr, args, l, c, type);
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3153
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3154 return retval;
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3155 }
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3156
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3157 // Make an indirect reference expression.
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3158
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3159 tree_index_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3160 octave_parser::make_indirect_ref (tree_expression *expr,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3161 const std::string& elt)
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3162 {
3930 61d4427c016e [project @ 2002-05-07 00:47:31 by jwe] jwe parents: 3929 diff changeset	3163 tree_index_expression *retval = 0;
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3164
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3165 int l = expr->line ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3166 int c = expr->column ();
b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3167
15954 46ca8488de92 Re-engineer tree_expression postfix handling to make it more flexible. Michael Goffioul <michael.goffioul@gmail.com> parents: 15895 diff changeset	3168 if (! expr->is_postfix_indexed ())
46ca8488de92 Re-engineer tree_expression postfix handling to make it more flexible. Michael Goffioul <michael.goffioul@gmail.com> parents: 15895 diff changeset	3169 expr->set_postfix_index ('.');
46ca8488de92 Re-engineer tree_expression postfix handling to make it more flexible. Michael Goffioul <michael.goffioul@gmail.com> parents: 15895 diff changeset	3170
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3171 if (expr->is_index_expression ())
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3172 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3173 tree_index_expression tmp = static_cast<tree_index_expression > (expr);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3174
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3175 tmp->append (elt);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3176
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3177 retval = tmp;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3178 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3179 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3930 diff changeset	3180 retval = new tree_index_expression (expr, elt, l, c);
2970 b9e64477f703 [project @ 1997-05-15 18:04:21 by jwe] jwe parents: 2961 diff changeset	3181
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	3182 curr_lexer->looking_at_indirect_ref = false;
751 c9f3cb77478d [project @ 1994-09-30 18:46:17 by jwe] jwe parents: 723 diff changeset	3183
c9f3cb77478d [project @ 1994-09-30 18:46:17 by jwe] jwe parents: 723 diff changeset	3184 return retval;
c9f3cb77478d [project @ 1994-09-30 18:46:17 by jwe] jwe parents: 723 diff changeset	3185 }
1511 74f9e88a2c12 [project @ 1995-10-03 10:49:31 by jwe] jwe parents: 1491 diff changeset	3186
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3187 // Make an indirect reference expression with dynamic field name.
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3188
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3189 tree_index_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3190 octave_parser::make_indirect_ref (tree_expression expr, tree_expression elt)
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3191 {
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3192 tree_index_expression *retval = 0;
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3193
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3194 int l = expr->line ();
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3195 int c = expr->column ();
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3196
15954 46ca8488de92 Re-engineer tree_expression postfix handling to make it more flexible. Michael Goffioul <michael.goffioul@gmail.com> parents: 15895 diff changeset	3197 if (! expr->is_postfix_indexed ())
46ca8488de92 Re-engineer tree_expression postfix handling to make it more flexible. Michael Goffioul <michael.goffioul@gmail.com> parents: 15895 diff changeset	3198 expr->set_postfix_index ('.');
46ca8488de92 Re-engineer tree_expression postfix handling to make it more flexible. Michael Goffioul <michael.goffioul@gmail.com> parents: 15895 diff changeset	3199
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3200 if (expr->is_index_expression ())
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3201 {
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3202 tree_index_expression tmp = static_cast<tree_index_expression > (expr);
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3203
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3204 tmp->append (elt);
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3205
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3206 retval = tmp;
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3207 }
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3208 else
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3209 retval = new tree_index_expression (expr, elt, l, c);
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3210
16110 7302f8a4df83 use pointer for global lexical_feedback structure John W. Eaton <jwe@octave.org> parents: 16109 diff changeset	3211 curr_lexer->looking_at_indirect_ref = false;
4131 597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3212
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3213 return retval;
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3214 }
597fbc55ea40 [project @ 2002-10-29 17:12:53 by jwe] jwe parents: 4064 diff changeset	3215
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3216 // Make a declaration command.
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3217
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3218 tree_decl_command *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3219 octave_parser::make_decl_command (int tok, token *tok_val,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3220 tree_decl_init_list *lst)
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3221 {
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3222 tree_decl_command *retval = 0;
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3223
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3224 int l = tok_val->line ();
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3225 int c = tok_val->column ();
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3226
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3227 switch (tok)
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3228 {
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3229 case GLOBAL:
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3230 retval = new tree_global_command (lst, l, c);
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3231 break;
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3232
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14293 diff changeset	3233 case PERSISTENT:
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3234 if (curr_fcn_depth > 0)
14294 9e3983c8963c deprecate the static keyword John W. Eaton <jwe@octave.org> parents: 14293 diff changeset	3235 retval = new tree_persistent_command (lst, l, c);
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3236 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3237 {
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	3238 if (curr_lexer->reading_script_file)
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	3239 warning ("ignoring persistent declaration near line %d of file '%s'",
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3240 l, curr_lexer->fcn_file_full_name.c_str ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3241 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3242 warning ("ignoring persistent declaration near line %d", l);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3243 }
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3244 break;
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3245
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3246 default:
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3247 panic_impossible ();
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3248 break;
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3249 }
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3250
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3251 return retval;
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3252 }
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2825 diff changeset	3253
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3254 tree_argument_list *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3255 octave_parser::validate_matrix_row (tree_argument_list *row)
10207 76a880a588ce error when using ~ in matrix expression Jaroslav Hajek <highegg@gmail.com> parents: 10206 diff changeset	3256 {
76a880a588ce error when using ~ in matrix expression Jaroslav Hajek <highegg@gmail.com> parents: 10206 diff changeset	3257 if (row && row->has_magic_tilde ())
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	3258 bison_error ("invalid use of tilde (~) in matrix expression");
10207 76a880a588ce error when using ~ in matrix expression Jaroslav Hajek <highegg@gmail.com> parents: 10206 diff changeset	3259 return row;
76a880a588ce error when using ~ in matrix expression Jaroslav Hajek <highegg@gmail.com> parents: 10206 diff changeset	3260 }
76a880a588ce error when using ~ in matrix expression Jaroslav Hajek <highegg@gmail.com> parents: 10206 diff changeset	3261
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3262 // Finish building a matrix list.
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3263
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3264 tree_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3265 octave_parser::finish_matrix (tree_matrix *m)
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3266 {
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 3099 diff changeset	3267 tree_expression *retval = m;
fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 3099 diff changeset	3268
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3269 unwind_protect frame;
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3270
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3271 frame.protect_var (error_state);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3272 frame.protect_var (warning_state);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3273
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3274 frame.protect_var (discard_error_messages);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3275 frame.protect_var (discard_warning_messages);
4452 f3c21a1d1c62 [project @ 2003-07-09 23:20:18 by jwe] jwe parents: 4426 diff changeset	3276
3815 c554ad71bafc [project @ 2001-04-19 19:50:52 by jwe] jwe parents: 3802 diff changeset	3277 discard_error_messages = true;
4452 f3c21a1d1c62 [project @ 2003-07-09 23:20:18 by jwe] jwe parents: 4426 diff changeset	3278 discard_warning_messages = true;
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3279
2533 987e934bbb8c [project @ 1996-11-19 18:21:23 by jwe] jwe parents: 2525 diff changeset	3280 if (m->all_elements_are_constant ())
1829 7d2982b55242 [project @ 1996-02-02 14:12:59 by jwe] jwe parents: 1826 diff changeset	3281 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	3282 octave_value tmp = m->rvalue1 ();
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3283
3489 cbee5fbb696d [project @ 2000-01-28 09:14:32 by jwe] jwe parents: 3485 diff changeset	3284 if (! (error_state \|\| warning_state))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3285 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3286 tree_constant *tc_retval
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3287 = new tree_constant (tmp, m->line (), m->column ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3288
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3289 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3290
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3291 tree_print_code tpc (buf);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3292
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3293 m->accept (tpc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3294
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3295 tc_retval->stash_original_text (buf.str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3296
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3297 delete m;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3298
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3299 retval = tc_retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3300 }
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3301 }
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 3099 diff changeset	3302
1623 fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3303 return retval;
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3304 }
fa7a847f9b92 [project @ 1995-11-06 18:05:09 by jwe] jwe parents: 1607 diff changeset	3305
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	3306 // Finish building a cell list.
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	3307
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3308 tree_expression *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3309 octave_parser::finish_cell (tree_cell *c)
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	3310 {
5875 f6ddc0ee2315 [project @ 2006-07-01 15:24:44 by jwe] jwe parents: 5864 diff changeset	3311 return finish_matrix (c);
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	3312 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3347 diff changeset	3313
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3314 void
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3315 octave_parser::maybe_warn_missing_semi (tree_statement_list *t)
1511 74f9e88a2c12 [project @ 1995-10-03 10:49:31 by jwe] jwe parents: 1491 diff changeset	3316 {
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3317 if (curr_fcn_depth > 0)
1511 74f9e88a2c12 [project @ 1995-10-03 10:49:31 by jwe] jwe parents: 1491 diff changeset	3318 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14584 diff changeset	3319 tree_statement *tmp = t->back ();
1607 795527e9db19 [project @ 1995-11-02 13:03:36 by jwe] jwe parents: 1588 diff changeset	3320
1511 74f9e88a2c12 [project @ 1995-10-03 10:49:31 by jwe] jwe parents: 1491 diff changeset	3321 if (tmp->is_expression ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3322 warning_with_id
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3323 ("Octave:missing-semicolon",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	3324 "missing semicolon near line %d, column %d in file '%s'",
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3325 tmp->line (), tmp->column (), curr_lexer->fcn_file_full_name.c_str ());
1511 74f9e88a2c12 [project @ 1995-10-03 10:49:31 by jwe] jwe parents: 1491 diff changeset	3326 }
74f9e88a2c12 [project @ 1995-10-03 10:49:31 by jwe] jwe parents: 1491 diff changeset	3327 }
1994 c2d20f365b84 [project @ 1996-03-03 01:19:32 by jwe] jwe parents: 1884 diff changeset	3328
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3329 tree_statement_list *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3330 octave_parser::set_stmt_print_flag (tree_statement_list *list, char sep,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3331 bool warn_missing_semi)
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3332 {
8471 02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3333 tree_statement *tmp = list->back ();
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3334
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3335 switch (sep)
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3336 {
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3337 case ';':
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	3338 tmp->set_print_flag (false);
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3339 break;
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3340
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3341 case 0:
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3342 case ',':
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3343 case '\n':
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8471 diff changeset	3344 tmp->set_print_flag (true);
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3345 if (warn_missing_semi)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3346 maybe_warn_missing_semi (list);
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3347 break;
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3348
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3349 default:
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3350 warning ("unrecognized separator type!");
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3351 break;
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3352 }
8471 02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3353
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3354 // Even if a statement is null, we add it to the list then remove it
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3355 // here so that the print flag is applied to the correct statement.
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3356
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3357 if (tmp->is_null_statement ())
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3358 {
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3359 list->pop_back ();
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3360 delete tmp;
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3361 }
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3362
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3363 return list;
2525 8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3364 }
8561d88be5f2 [project @ 1996-11-17 21:23:31 by jwe] jwe parents: 2524 diff changeset	3365
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3366 tree_statement_list *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3367 octave_parser::make_statement_list (tree_statement *stmt)
8448 d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	3368 {
8471 02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3369 return new tree_statement_list (stmt);
8448 d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	3370 }
d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	3371
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3372 tree_statement_list *
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3373 octave_parser::append_statement_list (tree_statement_list *list, char sep,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3374 tree_statement *stmt,
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3375 bool warn_missing_semi)
8448 d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	3376 {
8471 02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3377 set_stmt_print_flag (list, sep, warn_missing_semi);
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3378
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3379 list->append (stmt);
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3380
02de6775f1fe parse.y: always append statements to list, but remove null statements after seeing separator John W. Eaton <jwe@octave.org> parents: 8448 diff changeset	3381 return list;
8448 d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	3382 }
d6c0d5f208de parse.y: avoid storing null statements in statement lists John W. Eaton <jwe@octave.org> parents: 8447 diff changeset	3383
16145 edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3384 void
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3385 octave_parser::bison_error (const char *s)
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3386
16145 edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3387 {
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3388 int err_col = curr_lexer->current_input_column - 1;
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3389
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3390 std::ostringstream output_buf;
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3391
16199 810a71122c25 move more global variables to octave_lexical_feedback class John W. Eaton <jwe@octave.org> parents: 16198 diff changeset	3392 if (curr_lexer->reading_fcn_file \|\| curr_lexer->reading_script_file \|\| curr_lexer->reading_classdef_file)
16145 edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3393 output_buf << "parse error near line " << curr_lexer->input_line_number
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3394 << " of file " << curr_lexer->fcn_file_full_name;
16145 edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3395 else
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3396 output_buf << "parse error:";
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3397
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3398 if (s && strcmp (s, "parse error") != 0)
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3399 output_buf << "\n\n " << s;
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3400
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3401 output_buf << "\n\n";
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3402
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3403 if (! current_input_line.empty ())
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3404 {
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3405 size_t len = current_input_line.length ();
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3406
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3407 if (current_input_line[len-1] == '\n')
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3408 current_input_line.resize (len-1);
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3409
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3410 // Print the line, maybe with a pointer near the error token.
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3411
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3412 output_buf << ">>> " << current_input_line << "\n";
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3413
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3414 if (err_col == 0)
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3415 err_col = len;
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3416
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3417 for (int i = 0; i < err_col + 3; i++)
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3418 output_buf << " ";
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3419
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3420 output_buf << "^";
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3421 }
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3422
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3423 output_buf << "\n";
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3424
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3425 std::string msg = output_buf.str ();
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3426
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3427 parse_error ("%s", msg.c_str ());
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3428 }
edddf8903f15 maint: reorder functions in oct-parse.yy John W. Eaton <jwe@octave.org> parents: 16142 diff changeset	3429
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3430 static void
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3431 safe_fclose (FILE *f)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3432 {
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5774 diff changeset	3433 // FIXME -- comments at the end of an input file are
3765 e10451597802 [project @ 2001-01-17 18:41:29 by jwe] jwe parents: 3726 diff changeset	3434 // discarded (otherwise, they would be appended to the next
e10451597802 [project @ 2001-01-17 18:41:29 by jwe] jwe parents: 3726 diff changeset	3435 // statement, possibly from the command line or another file, which
e10451597802 [project @ 2001-01-17 18:41:29 by jwe] jwe parents: 3726 diff changeset	3436 // can be quite confusing).
e10451597802 [project @ 2001-01-17 18:41:29 by jwe] jwe parents: 3726 diff changeset	3437
5308 bc8d6ebb6ee1 [project @ 2005-04-27 05:08:19 by jwe] jwe parents: 5307 diff changeset	3438 octave_comment_list *tc = octave_comment_buffer::get_comment ();
bc8d6ebb6ee1 [project @ 2005-04-27 05:08:19 by jwe] jwe parents: 5307 diff changeset	3439
bc8d6ebb6ee1 [project @ 2005-04-27 05:08:19 by jwe] jwe parents: 5307 diff changeset	3440 delete tc;
3765 e10451597802 [project @ 2001-01-17 18:41:29 by jwe] jwe parents: 3726 diff changeset	3441
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3442 if (f)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3443 fclose (static_cast<FILE *> (f));
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3444 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3445
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3446 static octave_function *
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3447 parse_fcn_file (const std::string& full_file, const std::string& file,
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3448 const std::string& dispatch_type,
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3449 bool require_file, bool force_script, bool autoload,
a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3450 bool relative_lookup, const std::string& warn_for)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3451 {
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3452 unwind_protect frame;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3453
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3454 octave_function *fcn_ptr = 0;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3455
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3456 // Open function file and parse.
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3457
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3458 FILE *in_stream = command_editor::get_input_stream ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3459
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3460 frame.add_fcn (command_editor::set_input_stream, in_stream);
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3461
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3462 frame.protect_var (line_editing);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3463
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3464 line_editing = false;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3465
12989 00235a6446da eliminate duplication of internal variables controlling command history John W. Eaton <jwe@octave.org> parents: 12973 diff changeset	3466 frame.add_fcn (command_history::ignore_entries,
00235a6446da eliminate duplication of internal variables controlling command history John W. Eaton <jwe@octave.org> parents: 12973 diff changeset	3467 command_history::ignoring_entries ());
00235a6446da eliminate duplication of internal variables controlling command history John W. Eaton <jwe@octave.org> parents: 12973 diff changeset	3468
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3469 command_history::ignore_entries ();
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3470
16198 2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	3471 FILE *ffile = 0;
2c5c538be353 clean up input.cc and eliminate ff_instream global variable John W. Eaton <jwe@octave.org> parents: 16195 diff changeset	3472
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3473 if (! full_file.empty ())
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3474 ffile = gnulib::fopen (full_file.c_str (), "rb");
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3475
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3476 frame.add_fcn (safe_fclose, ffile);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3477
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3478 if (ffile)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3479 {
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	3480 bool eof;
4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	3481
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3482 // octave_parser constructor sets this for us.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3483 frame.protect_var (CURR_LEXER);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3484
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3485 <<<<<<< local
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3486 octave_parser *curr_parser = new octave_parser ();
16133 249d62b3fac8 new class for parser state John W. Eaton <jwe@octave.org> parents: 16124 diff changeset	3487 frame.add_fcn (octave_parser::cleanup, curr_parser);
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3488 =======
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	3489 octave_parser curr_parser (ffile);
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3490 >>>>>>> other
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3491
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3492 <<<<<<< local
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3493 curr_parser->curr_class_name = dispatch_type;
a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3494 curr_parser->autoloading = autoload;
a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3495 curr_parser->fcn_file_from_relative_lookup = relative_lookup;
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3496 =======
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	3497 curr_parser.curr_class_name = dispatch_type;
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	3498 curr_parser.autoloading = autoload;
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	3499 curr_parser.fcn_file_from_relative_lookup = relative_lookup;
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3500 >>>>>>> other
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3501
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3502 <<<<<<< local
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3503 std::string help_txt
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3504 = gobble_leading_white_space
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3505 (ffile, eof,
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3506 curr_parser->curr_lexer->input_line_number,
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3507 curr_parser->curr_lexer->current_input_column);
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3508 =======
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3509 // Do this with an unwind-protect cleanup function so that
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3510 // the forced variables will be unmarked in the event of an
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3511 // interrupt.
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3512 symbol_table::scope_id scope = symbol_table::top_scope ();
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3513 frame.add_fcn (symbol_table::unmark_forced_variables, scope);
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3514 >>>>>>> other
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3515
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3516 <<<<<<< local
10872 988d16d5ae34 correctly .m files that are empty or contain only comments John W. Eaton <jwe@octave.org> parents: 10659 diff changeset	3517 if (! help_txt.empty ())
988d16d5ae34 correctly .m files that are empty or contain only comments John W. Eaton <jwe@octave.org> parents: 10659 diff changeset	3518 help_buf.push (help_txt);
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3519 =======
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3520 curr_parser.curr_lexer->force_script = force_script;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3521 curr_parser.curr_lexer->prep_for_file ();
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3522 curr_parser.curr_lexer->parsing_class_method = ! dispatch_type.empty ();
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3523 >>>>>>> other
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3524
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3525 <<<<<<< local
7720 4e2eafef689c unify comment and help text processing in lex.l and parse.y John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	3526 if (! eof)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3527 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3528 std::string file_type;
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3529 =======
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3530 curr_parser.curr_lexer->fcn_file_name = file;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3531 curr_parser.curr_lexer->fcn_file_full_name = full_file;
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3532 >>>>>>> other
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3533
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3534 <<<<<<< local
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3535 frame.protect_var (get_input_from_eval_string);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3536 frame.protect_var (reading_fcn_file);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3537 frame.protect_var (reading_script_file);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3538 frame.protect_var (reading_classdef_file);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3539 frame.protect_var (Vecho_executing_commands);
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3540 =======
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3541 int status = curr_parser.run ();
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3542 >>>>>>> other
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3543
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3544 <<<<<<< local
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3545 get_input_from_eval_string = false;
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3546 =======
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3547 fcn_ptr = curr_parser.primary_fcn_ptr;
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3548 >>>>>>> other
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3549
a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3550 <<<<<<< local
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3551 if (! force_script && looking_at_function_keyword (ffile))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3552 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3553 file_type = "function";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3554
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3555 Vecho_executing_commands = ECHO_OFF;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3556
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3557 reading_classdef_file = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3558 reading_fcn_file = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3559 reading_script_file = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3560 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3561 else if (! force_script && looking_at_classdef_keyword (ffile))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3562 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3563 file_type = "classdef";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3564
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3565 Vecho_executing_commands = ECHO_OFF;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3566
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3567 reading_classdef_file = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3568 reading_fcn_file = false;
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3569 reading_script_file = false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3570 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3571 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3572 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3573 file_type = "script";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3574
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3575 Vecho_executing_commands = ECHO_OFF;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3576
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3577 reading_classdef_file = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3578 reading_fcn_file = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3579 reading_script_file = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3580 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3581
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3582 // Do this with an unwind-protect cleanup function so that
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3583 // the forced variables will be unmarked in the event of an
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	3584 // interrupt.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3585 symbol_table::scope_id scope = symbol_table::top_scope ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3586 frame.add_fcn (symbol_table::unmark_forced_variables, scope);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3587
10879 5af852c93af3 oct-parse.yy: Restore parsing of help text. Rik <octave@nomad.inbox5.com> parents: 10872 diff changeset	3588 if (! help_txt.empty ())
5af852c93af3 oct-parse.yy: Restore parsing of help text. Rik <octave@nomad.inbox5.com> parents: 10872 diff changeset	3589 help_buf.push (help_txt);
5af852c93af3 oct-parse.yy: Restore parsing of help text. Rik <octave@nomad.inbox5.com> parents: 10872 diff changeset	3590
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3591 if (reading_script_file)
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3592 curr_parser->curr_lexer->prep_for_script_file ();
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3593 else if (reading_classdef_file)
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3594 curr_parser->curr_lexer->prep_for_classdef_file ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3595 else
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3596 curr_parser->curr_lexer->prep_for_function_file ();
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3597
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3598 curr_parser->curr_lexer->parsing_class_method = ! dispatch_type.empty ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3599
11258 795c97ace02c eliminate some possible memory leaks John W. Eaton <jwe@octave.org> parents: 11225 diff changeset	3600 frame.protect_var (global_command);
795c97ace02c eliminate some possible memory leaks John W. Eaton <jwe@octave.org> parents: 11225 diff changeset	3601
795c97ace02c eliminate some possible memory leaks John W. Eaton <jwe@octave.org> parents: 11225 diff changeset	3602 global_command = 0;
795c97ace02c eliminate some possible memory leaks John W. Eaton <jwe@octave.org> parents: 11225 diff changeset	3603
16138 284e2ca86ef7 execute parser using member function of octave_parser class John W. Eaton <jwe@octave.org> parents: 16136 diff changeset	3604 int status = curr_parser->run ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3605
13970 c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	3606 // Use an unwind-protect cleanup function so that the
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	3607 // global_command list will be deleted in the event of an
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	3608 // interrupt.
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	3609
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	3610 frame.add_fcn (cleanup_statement_list, &global_command);
11258 795c97ace02c eliminate some possible memory leaks John W. Eaton <jwe@octave.org> parents: 11225 diff changeset	3611
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3612 fcn_ptr = curr_parser->primary_fcn_ptr;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3613
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3614 if (status == 0)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3615 {
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3616 if (reading_classdef_file && curr_parser->classdef_object)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3617 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3618 // Convert parse tree for classdef object to
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3619 // meta.class info (and stash it in the symbol
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3620 // table?). Return pointer to constructor?
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15576 diff changeset	3621
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15576 diff changeset	3622 if (fcn_ptr)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15576 diff changeset	3623 panic_impossible ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15576 diff changeset	3624
16155 0259254a3ccc maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 15954 16153 diff changeset	3625 fcn_ptr = curr_parser->classdef_object->make_meta_class ();
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3626 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3627 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3628 else
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3629 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3630 error ("parse error while reading %s file %s",
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3631 file_type.c_str(), ff.c_str ());
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14846 diff changeset	3632 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3633 }
10872 988d16d5ae34 correctly .m files that are empty or contain only comments John W. Eaton <jwe@octave.org> parents: 10659 diff changeset	3634 else
988d16d5ae34 correctly .m files that are empty or contain only comments John W. Eaton <jwe@octave.org> parents: 10659 diff changeset	3635 {
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3636 int l = curr_parser->curr_lexer->input_line_number;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3637 int c = curr_parser->curr_lexer->current_input_column;
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3638
10872 988d16d5ae34 correctly .m files that are empty or contain only comments John W. Eaton <jwe@octave.org> parents: 10659 diff changeset	3639 tree_statement *end_of_script
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	3640 = curr_parser->make_end ("endscript", l, c);
16134 ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3641
ec9c6222ef5a move static parser helper functions to octave_parser class John W. Eaton <jwe@octave.org> parents: 16133 diff changeset	3642 curr_parser->make_script (0, end_of_script);
10872 988d16d5ae34 correctly .m files that are empty or contain only comments John W. Eaton <jwe@octave.org> parents: 10659 diff changeset	3643
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3644 fcn_ptr = curr_parser->primary_fcn_ptr;
10872 988d16d5ae34 correctly .m files that are empty or contain only comments John W. Eaton <jwe@octave.org> parents: 10659 diff changeset	3645 }
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3646 =======
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3647 if (status != 0)
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3648 error ("parse error while reading file %s", full_file.c_str ());
16205 a8f9eb92fa6e maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 16155 16203 diff changeset	3649 >>>>>>> other
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3650 }
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3651 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	3652 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	3653 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	3654 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	3655 full_file.c_str ());
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3656
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3657 return fcn_ptr;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3658 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3659
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3660 std::string
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3661 get_help_from_file (const std::string& nm, bool& symbol_found,
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3662 std::string& full_file)
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3663 {
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3664 std::string retval;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3665
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3666 full_file = fcn_file_in_path (nm);
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3667
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3668 std::string file = full_file;
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3669
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3670 size_t file_len = file.length ();
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3671
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3672 if ((file_len > 4 && file.substr (file_len-4) == ".oct")
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3673 \|\| (file_len > 4 && file.substr (file_len-4) == ".mex")
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3674 \|\| (file_len > 2 && file.substr (file_len-2) == ".m"))
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3675 {
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3676 file = octave_env::base_pathname (file);
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3677 file = file.substr (0, file.find_last_of ('.'));
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3678
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3679 size_t pos = file.find_last_of (file_ops::dir_sep_str ());
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3680 if (pos != std::string::npos)
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3681 file = file.substr (pos+1);
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3682 }
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3683
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3684 if (! file.empty ())
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3685 {
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3686 symbol_found = true;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3687
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3688 octave_function *fcn
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3689 = parse_fcn_file (full_file, file, "", true, false, false, false, "");
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3690
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3691 if (fcn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3692 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3693 retval = fcn->doc_string ();
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3694
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3695 delete fcn;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3696 }
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3697 }
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3698
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3699 return retval;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3700 }
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3701
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3702 std::string
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3703 get_help_from_file (const std::string& nm, bool& symbol_found)
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3704 {
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3705 std::string file;
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3706 return get_help_from_file (nm, symbol_found, file);
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3707 }
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3708
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3709 std::string
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3710 lookup_autoload (const std::string& nm)
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3711 {
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3712 std::string retval;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3713
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3714 typedef std::map<std::string, std::string>::const_iterator am_iter;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3715
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3716 am_iter p = autoload_map.find (nm);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3717
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3718 if (p != autoload_map.end ())
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 6238 diff changeset	3719 retval = load_path::find_file (p->second);
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3720
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3721 return retval;
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3722 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3723
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	3724 string_vector
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3725 autoloaded_functions (void)
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3726 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14584 diff changeset	3727 string_vector names (autoload_map.size ());
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3728
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3729 octave_idx_type i = 0;
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3730 typedef std::map<std::string, std::string>::const_iterator am_iter;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3731 for (am_iter p = autoload_map.begin (); p != autoload_map.end (); p++)
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3732 names[i++] = p->first;
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3733
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3734 return names;
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3735 }
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3736
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3737 string_vector
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3738 reverse_lookup_autoload (const std::string& nm)
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3739 {
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3740 string_vector names;
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3741
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3742 typedef std::map<std::string, std::string>::const_iterator am_iter;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3743 for (am_iter p = autoload_map.begin (); p != autoload_map.end (); p++)
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3744 if (nm == p->second)
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3745 names.append (p->first);
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3746
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3747 return names;
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3748 }
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5484 diff changeset	3749
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3750 octave_function *
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3751 load_fcn_from_file (const std::string& file_name, const std::string& dir_name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3752 const std::string& dispatch_type,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3753 const std::string& fcn_name, bool autoload)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3754 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3755 octave_function *retval = 0;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3756
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3757 unwind_protect frame;
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3758
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3759 std::string nm = file_name;
6238 3ecd8d2c5654 [project @ 2007-01-10 21:13:21 by jwe] jwe parents: 6235 diff changeset	3760
3ecd8d2c5654 [project @ 2007-01-10 21:13:21 by jwe] jwe parents: 6235 diff changeset	3761 size_t nm_len = nm.length ();
5472 e2f85b298a74 [project @ 2005-09-23 21:10:36 by jwe] jwe parents: 5400 diff changeset	3762
e2f85b298a74 [project @ 2005-09-23 21:10:36 by jwe] jwe parents: 5400 diff changeset	3763 std::string file;
e2f85b298a74 [project @ 2005-09-23 21:10:36 by jwe] jwe parents: 5400 diff changeset	3764
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3765 bool relative_lookup = false;
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 6238 diff changeset	3766
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3767 file = nm;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3768
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3769 if ((nm_len > 4 && nm.substr (nm_len-4) == ".oct")
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3770 \|\| (nm_len > 4 && nm.substr (nm_len-4) == ".mex")
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3771 \|\| (nm_len > 2 && nm.substr (nm_len-2) == ".m"))
5472 e2f85b298a74 [project @ 2005-09-23 21:10:36 by jwe] jwe parents: 5400 diff changeset	3772 {
6238 3ecd8d2c5654 [project @ 2007-01-10 21:13:21 by jwe] jwe parents: 6235 diff changeset	3773 nm = octave_env::base_pathname (file);
3ecd8d2c5654 [project @ 2007-01-10 21:13:21 by jwe] jwe parents: 6235 diff changeset	3774 nm = nm.substr (0, nm.find_last_of ('.'));
11136 a51ac4198e1c oct-parse.yy (load_fcn_from_file): also strip directory when computing function name from filename John W. Eaton <jwe@octave.org> parents: 11091 diff changeset	3775
a51ac4198e1c oct-parse.yy (load_fcn_from_file): also strip directory when computing function name from filename John W. Eaton <jwe@octave.org> parents: 11091 diff changeset	3776 size_t pos = nm.find_last_of (file_ops::dir_sep_str ());
a51ac4198e1c oct-parse.yy (load_fcn_from_file): also strip directory when computing function name from filename John W. Eaton <jwe@octave.org> parents: 11091 diff changeset	3777 if (pos != std::string::npos)
11138 40206fe759db oct-parse.yy: fix typo in previous change John W. Eaton <jwe@octave.org> parents: 11136 diff changeset	3778 nm = nm.substr (pos+1);
5472 e2f85b298a74 [project @ 2005-09-23 21:10:36 by jwe] jwe parents: 5400 diff changeset	3779 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3780
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3781 relative_lookup = ! octave_env::absolute_pathname (file);
7749 14e05160b99f reference counting for functions loaded from shared libraries John W. Eaton <jwe@octave.org> parents: 7736 diff changeset	3782
10250 2d47356a7a1a use gnulib getcwd module John W. Eaton <jwe@octave.org> parents: 10230 diff changeset	3783 file = octave_env::make_absolute (file);
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	3784
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	3785 int len = file.length ();
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4240 diff changeset	3786
4244 189df16144fc [project @ 2002-12-28 02:00:05 by jwe] jwe parents: 4243 diff changeset	3787 if (len > 4 && file.substr (len-4, len-1) == ".oct")
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3788 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3789 if (autoload && ! fcn_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3790 nm = fcn_name;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3791
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3792 retval = octave_dynamic_loader::load_oct (nm, file, relative_lookup);
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5861 diff changeset	3793 }
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5861 diff changeset	3794 else if (len > 4 && file.substr (len-4, len-1) == ".mex")
10570 a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3795 {
a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3796 // Temporarily load m-file version of mex-file, if it exists,
a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3797 // to get the help-string to use.
a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3798
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	3799 octave_function *tmpfcn = parse_fcn_file (file.substr (0, len - 2),
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3800 nm, dispatch_type, false,
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3801 autoload, autoload,
a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3802 relative_lookup, "");
a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3803
a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3804 retval = octave_dynamic_loader::load_mex (nm, file, relative_lookup);
10570 a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3805
a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3806 if (tmpfcn)
a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3807 retval->document (tmpfcn->doc_string ());
a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3808 delete tmpfcn;
a61d7248627c When loading a mex-file temporarily load the m-file version to get the help string (bug #29427) David Bateman <dbateman@free.fr> parents: 10521 diff changeset	3809 }
4244 189df16144fc [project @ 2002-12-28 02:00:05 by jwe] jwe parents: 4243 diff changeset	3810 else if (len > 2)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3811 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	3812 retval = parse_fcn_file (file, nm, dispatch_type, true, autoload,
16153 a57c2c8c8163 move some variables into the octave_parser class John W. Eaton <jwe@octave.org> parents: 16151 diff changeset	3813 autoload, relative_lookup, "");
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3814 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	3815
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3816 if (retval)
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	3817 {
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	3818 retval->stash_dir_name (dir_name);
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	3819
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	3820 if (retval->is_user_function ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3821 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3822 symbol_table::scope_id id = retval->scope ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3823
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3824 symbol_table::stash_dir_name_for_subfunctions (id, dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3825 }
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	3826 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3827
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	3828 return retval;
5312 80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe] jwe parents: 5309 diff changeset	3829 }
80c1aa832cb2 [project @ 2005-04-28 01:54:46 by jwe] jwe parents: 5309 diff changeset	3830
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8745 diff changeset	3831 DEFUN (autoload, args, ,
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3832 "-- texinfo --\n\
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3833 @deftypefn {Built-in Function} {} autoload (@var{function}, @var{file})\n\
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3834 Define @var{function} to autoload from @var{file}.\n\
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3835 \n\
6926 c05fbb1b7e1f [project @ 2007-09-26 19:56:54 by dbateman] dbateman parents: 6657 diff changeset	3836 The second argument, @var{file}, should be an absolute file name or\n\
c05fbb1b7e1f [project @ 2007-09-26 19:56:54 by dbateman] dbateman parents: 6657 diff changeset	3837 a file name in the same directory as the function or script from which\n\
9038 fca0dc2fb042 Cleanup documentation files stmt.texi and func.texi Rik <rdrider0-list@yahoo.com> parents: 8974 diff changeset	3838 the autoload command was run. @var{file} should not depend on the\n\
6926 c05fbb1b7e1f [project @ 2007-09-26 19:56:54 by dbateman] dbateman parents: 6657 diff changeset	3839 Octave load path.\n\
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3840 \n\
ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3841 Normally, calls to @code{autoload} appear in PKG_ADD script files that\n\
ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3842 are evaluated when a directory is added to the Octave's load path. To\n\
6926 c05fbb1b7e1f [project @ 2007-09-26 19:56:54 by dbateman] dbateman parents: 6657 diff changeset	3843 avoid having to hardcode directory names in @var{file}, if @var{file}\n\
c05fbb1b7e1f [project @ 2007-09-26 19:56:54 by dbateman] dbateman parents: 6657 diff changeset	3844 is in the same directory as the PKG_ADD script then\n\
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3845 \n\
ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3846 @example\n\
6926 c05fbb1b7e1f [project @ 2007-09-26 19:56:54 by dbateman] dbateman parents: 6657 diff changeset	3847 autoload (\"foo\", \"bar.oct\");\n\
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3848 @end example\n\
ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3849 \n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	3850 @noindent\n\
9038 fca0dc2fb042 Cleanup documentation files stmt.texi and func.texi Rik <rdrider0-list@yahoo.com> parents: 8974 diff changeset	3851 will load the function @code{foo} from the file @code{bar.oct}. The above\n\
6926 c05fbb1b7e1f [project @ 2007-09-26 19:56:54 by dbateman] dbateman parents: 6657 diff changeset	3852 when @code{bar.oct} is not in the same directory or uses like\n\
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3853 \n\
ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3854 @example\n\
6637 c18ed0e7ee41 [project @ 2007-05-21 19:12:46 by jwe] jwe parents: 6431 diff changeset	3855 autoload (\"foo\", file_in_loadpath (\"bar.oct\"))\n\
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3856 @end example\n\
ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3857 \n\
ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3858 @noindent\n\
6926 c05fbb1b7e1f [project @ 2007-09-26 19:56:54 by dbateman] dbateman parents: 6657 diff changeset	3859 are strongly discouraged, as their behavior might be unpredictable.\n\
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3860 \n\
6637 c18ed0e7ee41 [project @ 2007-05-21 19:12:46 by jwe] jwe parents: 6431 diff changeset	3861 With no arguments, return a structure containing the current autoload map.\n\
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3862 @seealso{PKG_ADD}\n\
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3863 @end deftypefn")
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3864 {
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3865 octave_value retval;
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3866
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3867 int nargin = args.length ();
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3868
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3869 if (nargin == 0)
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3870 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	3871 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	3872 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	3873
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3874 octave_idx_type i = 0;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3875 typedef std::map<std::string, std::string>::const_iterator am_iter;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3876 for (am_iter p = autoload_map.begin (); p != autoload_map.end (); p++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3877 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3878 func_names(i) = p->first;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3879 file_names(i) = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3880
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3881 i++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3882 }
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3883
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	3884 octave_map m;
5626 3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3885
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3886 m.assign ("function", func_names);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3887 m.assign ("file", file_names);
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3888
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3889 retval = m;
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3890 }
3236b4d98fde [project @ 2006-02-15 20:25:39 by jwe] jwe parents: 5615 diff changeset	3891 else if (nargin == 2)
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3892 {
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3893 string_vector argv = args.make_argv ("autoload");
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3894
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3895 if (! error_state)
6380 ac3d67504f85 [project @ 2007-03-02 22:08:06 by jwe] jwe parents: 6379 diff changeset	3896 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3897 std::string nm = argv[2];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3898
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3899 if (! octave_env::absolute_pathname (nm))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3900 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3901 octave_user_code *fcn = octave_call_stack::caller_user_code ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3902
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3903 bool found = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3904
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3905 if (fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3906 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3907 std::string fname = fcn->fcn_file_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3908
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3909 if (! fname.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3910 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3911 fname = octave_env::make_absolute (fname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3912 fname = fname.substr (0, fname.find_last_of (file_ops::dir_sep_str ()) + 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3913
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3914 file_stat fs (fname + nm);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3915
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3916 if (fs.exists ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3917 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3918 nm = fname + nm;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3919 found = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3920 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3921 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3922 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3923 if (! found)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3924 warning_with_id ("Octave:autoload-relative-file-name",
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	3925 "autoload: '%s' is not an absolute file name",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3926 nm.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3927 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3928 autoload_map[argv[1]] = nm;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3929 }
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3930 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3931 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	3932 print_usage ();
5484 2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3933
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3934 return retval;
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3935 }
2ff5363a16bd [project @ 2005-10-06 17:12:12 by jwe] jwe parents: 5472 diff changeset	3936
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	3937 void
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	3938 source_file (const std::string& file_name, const std::string& context,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3939 bool verbose, bool require_file, const std::string& warn_for)
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	3940 {
10578 cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3941 // Map from absolute name of script file to recursion level. We
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3942 // use a map instead of simply placing a limit on recursion in the
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3943 // source_file function so that two mutually recursive scripts
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3944 // written as
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3945 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3946 // foo1.m:
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3947 // ------
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3948 // foo2
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3949 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3950 // foo2.m:
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3951 // ------
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3952 // foo1
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3953 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3954 // and called with
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3955 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3956 // foo1
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3957 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3958 // (for example) will behave the same if they are written as
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3959 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3960 // foo1.m:
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3961 // ------
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3962 // source ("foo2.m")
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3963 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3964 // foo2.m:
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3965 // ------
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3966 // source ("foo1.m")
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3967 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3968 // and called with
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3969 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3970 // source ("foo1.m")
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3971 //
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3972 // (for example).
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3973
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3974 static std::map<std::string, int> source_call_depth;
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3975
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	3976 std::string file_full_name = file_ops::tilde_expand (file_name);
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	3977
10578 cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3978 file_full_name = octave_env::make_absolute (file_full_name);
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3979
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3980 unwind_protect frame;
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	3981
10578 cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3982 if (source_call_depth.find (file_full_name) == source_call_depth.end ())
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3983 source_call_depth[file_full_name] = -1;
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3984
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3985 frame.protect_var (source_call_depth[file_full_name]);
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3986
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3987 source_call_depth[file_full_name]++;
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3988
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3989 if (source_call_depth[file_full_name] >= Vmax_recursion_depth)
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3990 {
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3991 error ("max_recursion_depth exceeded");
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3992 return;
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3993 }
cb0883127251 limit on recursion via calls to source function John W. Eaton <jwe@octave.org> parents: 10570 diff changeset	3994
5975 e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	3995 if (! context.empty ())
e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	3996 {
e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	3997 if (context == "caller")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	3998 octave_call_stack::goto_caller_frame ();
5975 e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	3999 else if (context == "base")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4000 octave_call_stack::goto_base_frame ();
5975 e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	4001 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4002 error ("source: context must be \"caller\" or \"base\"");
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4003
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4004 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4005 frame.add_fcn (octave_call_stack::pop);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	4006 }
5975 e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	4007
e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	4008 if (! error_state)
e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	4009 {
16203 127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4010 octave_function *fcn = parse_fcn_file (file_full_name, file_name,
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4011 "", require_file, true,
127cccb037bf move more global parser and lexer variables to classes John W. Eaton <jwe@octave.org> parents: 16199 diff changeset	4012 false, false, warn_for);
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	4013
5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	4014 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4015 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4016 if (fcn && fcn->is_user_script ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4017 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4018 octave_value_list args;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4019
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4020 if (verbose)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4021 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4022 std::cout << "executing commands from " << file_full_name << " ... ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4023 reading_startup_message_printed = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4024 std::cout.flush ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4025 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4026
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4027 fcn->do_multi_index_op (0, args);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4028
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4029 if (verbose)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4030 std::cout << "done." << std::endl;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4031
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4032 delete fcn;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4033 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4034 }
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7699 diff changeset	4035 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	4036 error ("source: error sourcing file '%s'",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4037 file_full_name.c_str ());
5975 e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	4038 }
4486 6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	4039 }
6ceba1f351fb [project @ 2003-08-22 16:49:46 by jwe] jwe parents: 4463 diff changeset	4040
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4041 DEFUN (mfilename, args, ,
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4042 "-- texinfo --\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	4043 @deftypefn {Built-in Function} {} mfilename ()\n\
12719 7b5bfd6a8e28 doc: Don't use @code macro within @deftypefn macro Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	4044 @deftypefnx {Built-in Function} {} mfilename (\"fullpath\")\n\
7b5bfd6a8e28 doc: Don't use @code macro within @deftypefn macro Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	4045 @deftypefnx {Built-in Function} {} mfilename (\"fullpathext\")\n\
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4046 Return the name of the currently executing file. At the top-level,\n\
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4047 return the empty string. Given the argument @code{\"fullpath\"},\n\
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4048 include the directory part of the file name, but not the extension.\n\
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4049 Given the argument @code{\"fullpathext\"}, include the directory part\n\
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4050 of the file name and the extension.\n\
5774 e7af222e98b0 [project @ 2006-04-24 17:45:31 by jwe] jwe parents: 5765 diff changeset	4051 @end deftypefn")
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4052 {
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4053 octave_value retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4054
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4055 int nargin = args.length ();
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4056
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4057 if (nargin > 1)
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4058 {
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	4059 print_usage ();
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4060 return retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4061 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4062
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4063 std::string arg;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4064
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4065 if (nargin == 1)
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4066 {
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4067 arg = args(0).string_value ();
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4068
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4069 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4070 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4071 error ("mfilename: expecting argument to be a character string");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4072 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4073 }
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4074 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4075
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4076 std::string fname;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4077
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	4078 octave_user_code *fcn = octave_call_stack::caller_user_code ();
5743 a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4079
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4080 if (fcn)
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4081 {
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4082 fname = fcn->fcn_file_name ();
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4083
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4084 if (fname.empty ())
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4085 fname = fcn->name ();
a527e0f77aa5 [project @ 2006-04-06 08:20:21 by jwe] jwe parents: 5739 diff changeset	4086 }
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4087
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4088 if (arg == "fullpathext")
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4089 retval = fname;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4090 else
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4091 {
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 8001 diff changeset	4092 size_t dpos = fname.rfind (file_ops::dir_sep_char ());
5747 b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe] jwe parents: 5744 diff changeset	4093 size_t epos = fname.rfind ('.');
b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe] jwe parents: 5744 diff changeset	4094
b09d4d0f5b63 [project @ 2006-04-07 06:43:10 by jwe] jwe parents: 5744 diff changeset	4095 if (epos <= dpos)
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	4096 epos = std::string::npos;
85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	4097
85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	4098 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	4099
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4100 if (arg == "fullpath")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4101 retval = fname;
5739 d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4102 else
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	4103 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	4104 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4105
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4106 return retval;
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4107 }
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4108
d090d39bb82c [project @ 2006-04-05 06:56:24 by jwe] jwe parents: 5667 diff changeset	4109
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4110 DEFUN (source, args, ,
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4111 "-- texinfo --\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4112 @deftypefn {Built-in Function} {} source (@var{file})\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4113 Parse and execute the contents of @var{file}. This is equivalent to\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4114 executing commands from a script file, but without requiring the file to\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4115 be named @file{@var{file}.m}.\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4116 @end deftypefn")
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4117 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4118 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4119
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4120 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4121
5975 e64059303a6f [project @ 2006-08-29 16:37:39 by jwe] jwe parents: 5932 diff changeset	4122 if (nargin == 1 \|\| nargin == 2)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4123 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3489 diff changeset	4124 std::string file_name = args(0).string_value ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4125
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4126 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4127 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4128 std::string context;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4129
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4130 if (nargin == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4131 context = args(1).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4132
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4133 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4134 source_file (file_name, context);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4135 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4136 error ("source: expecting context to be character string");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4137 }
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4138 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4139 error ("source: expecting file name as argument");
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4140 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4141 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	4142 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4143
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4144 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4145 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4146
3726 b7d997d593d9 [project @ 2000-10-27 17:51:21 by jwe] jwe parents: 3712 diff changeset	4147 // Evaluate an Octave function (built-in or interpreted) and return
3844 87f85453b6b7 [project @ 2001-07-23 20:07:45 by jwe] jwe parents: 3815 diff changeset	4148 // the list of result values. NAME is the name of the function to
87f85453b6b7 [project @ 2001-07-23 20:07:45 by jwe] jwe parents: 3815 diff changeset	4149 // call. ARGS are the arguments to the function. NARGOUT is the
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	4150 // number of output arguments expected.
3726 b7d997d593d9 [project @ 2000-10-27 17:51:21 by jwe] jwe parents: 3712 diff changeset	4151
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4152 octave_value_list
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3489 diff changeset	4153 feval (const std::string& name, const octave_value_list& args, int nargout)
3156 a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3110 diff changeset	4154 {
a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3110 diff changeset	4155 octave_value_list retval;
a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3110 diff changeset	4156
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4157 octave_value fcn = symbol_table::find_function (name, args);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4158
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4159 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4160 retval = fcn.do_multi_index_op (nargout, args);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	4161 else
10443 34e51d4e199b implement smart warnings about missing Matlab functionality Jaroslav Hajek <highegg@gmail.com> parents: 10426 diff changeset	4162 {
34e51d4e199b implement smart warnings about missing Matlab functionality Jaroslav Hajek <highegg@gmail.com> parents: 10426 diff changeset	4163 maybe_missing_function_hook (name);
34e51d4e199b implement smart warnings about missing Matlab functionality Jaroslav Hajek <highegg@gmail.com> parents: 10426 diff changeset	4164 if (! error_state)
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	4165 error ("feval: function '%s' not found", name.c_str ());
10443 34e51d4e199b implement smart warnings about missing Matlab functionality Jaroslav Hajek <highegg@gmail.com> parents: 10426 diff changeset	4166 }
3156 a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3110 diff changeset	4167
a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3110 diff changeset	4168 return retval;
a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3110 diff changeset	4169 }
a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3110 diff changeset	4170
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4171 octave_value_list
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4172 feval (octave_function *fcn, const octave_value_list& args, int nargout)
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4173 {
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4174 octave_value_list retval;
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4175
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4176 if (fcn)
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4177 retval = fcn->do_multi_index_op (nargout, args);
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4178
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4179 return retval;
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4180 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4181
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4182 static octave_value_list
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4183 get_feval_args (const octave_value_list& args)
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4184 {
10659 8baff2aceabc fix slicing value lists with name tags (bug #29960) Jaroslav Hajek <highegg@gmail.com> parents: 10578 diff changeset	4185 return args.slice (1, args.length () - 1, true);
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4186 }
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4187
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4188
3726 b7d997d593d9 [project @ 2000-10-27 17:51:21 by jwe] jwe parents: 3712 diff changeset	4189 // Evaluate an Octave function (built-in or interpreted) and return
b7d997d593d9 [project @ 2000-10-27 17:51:21 by jwe] jwe parents: 3712 diff changeset	4190 // the list of result values. The first element of ARGS should be a
b7d997d593d9 [project @ 2000-10-27 17:51:21 by jwe] jwe parents: 3712 diff changeset	4191 // string containing the name of the function to call, then the rest
b7d997d593d9 [project @ 2000-10-27 17:51:21 by jwe] jwe parents: 3712 diff changeset	4192 // are the actual arguments to the function. NARGOUT is the number of
b7d997d593d9 [project @ 2000-10-27 17:51:21 by jwe] jwe parents: 3712 diff changeset	4193 // output arguments expected.
b7d997d593d9 [project @ 2000-10-27 17:51:21 by jwe] jwe parents: 3712 diff changeset	4194
3156 a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3110 diff changeset	4195 octave_value_list
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4196 feval (const octave_value_list& args, int nargout)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4197 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4198 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4199
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4200 int nargin = args.length ();
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4201
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4202 if (nargin > 0)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4203 {
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4204 octave_value f_arg = args(0);
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4205
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4206 if (f_arg.is_string ())
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4318 diff changeset	4207 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4208 std::string name = f_arg.string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4209
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4210 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4211 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4212 octave_value_list tmp_args = get_feval_args (args);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4213
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4214 retval = feval (name, tmp_args, nargout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4215 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4216 }
13241 2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13237 diff changeset	4217 else if (f_arg.is_function_handle ()
2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13237 diff changeset	4218 \|\| f_arg.is_anonymous_function ()
2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13237 diff changeset	4219 \|\| f_arg.is_inline_function ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4220 {
10492 a6b64a7a3769 make feval work with overloaded handles Jaroslav Hajek <highegg@gmail.com> parents: 10463 diff changeset	4221 const octave_value_list tmp_args = get_feval_args (args);
a6b64a7a3769 make feval work with overloaded handles Jaroslav Hajek <highegg@gmail.com> parents: 10463 diff changeset	4222
a6b64a7a3769 make feval work with overloaded handles Jaroslav Hajek <highegg@gmail.com> parents: 10463 diff changeset	4223 retval = f_arg.do_multi_index_op (nargout, tmp_args);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4224 }
10492 a6b64a7a3769 make feval work with overloaded handles Jaroslav Hajek <highegg@gmail.com> parents: 10463 diff changeset	4225 else
a6b64a7a3769 make feval work with overloaded handles Jaroslav Hajek <highegg@gmail.com> parents: 10463 diff changeset	4226 error ("feval: first argument must be a string, inline function or a function handle");
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4227 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4228
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4229 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4230 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4231
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4232 DEFUN (feval, args, nargout,
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4233 "-- texinfo --\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4234 @deftypefn {Built-in Function} {} feval (@var{name}, @dots{})\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4235 Evaluate the function named @var{name}. Any arguments after the first\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4236 are passed on to the named function. For example,\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4237 \n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4238 @example\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	4239 @group\n\
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4240 feval (\"acos\", -1)\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4241 @result{} 3.1416\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	4242 @end group\n\
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4243 @end example\n\
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4244 \n\
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4245 @noindent\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4246 calls the function @code{acos} with the argument @samp{-1}.\n\
86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4247 \n\
12946 8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4248 The function @code{feval} can also be used with function handles of\n\
13019 1653d3a86fca doc: Fix warnings and errors in Texinfo required for building docs on stable branch. Rik <octave@nomad.inbox5.com> parents: 12946 diff changeset	4249 any sort (@pxref{Function Handles}). Historically, @code{feval} was\n\
12946 8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4250 the only way to call user-supplied functions in strings, but\n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4251 function handles are now preferred due to the cleaner syntax they\n\
13019 1653d3a86fca doc: Fix warnings and errors in Texinfo required for building docs on stable branch. Rik <octave@nomad.inbox5.com> parents: 12946 diff changeset	4252 offer. For example,\n\
12946 8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4253 \n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4254 @example\n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4255 @group\n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4256 @var{f} = @@exp;\n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4257 feval (@var{f}, 1)\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14329 diff changeset	4258 @result{} 2.7183\n\
12946 8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4259 @var{f} (1)\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14329 diff changeset	4260 @result{} 2.7183\n\
12946 8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4261 @end group\n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4262 @end example\n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4263 \n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4264 @noindent\n\
13019 1653d3a86fca doc: Fix warnings and errors in Texinfo required for building docs on stable branch. Rik <octave@nomad.inbox5.com> parents: 12946 diff changeset	4265 are equivalent ways to call the function referred to by @var{f}. If it\n\
12946 8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4266 cannot be predicted beforehand that @var{f} is a function handle or the\n\
8b5b85e26246 octave-parse.yy (feval): Update docstring to refer to function handles. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12918 diff changeset	4267 function name in a string, @code{feval} can be used instead.\n\
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4268 @end deftypefn")
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4269 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4270 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4271
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4272 int nargin = args.length ();
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4273
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4274 if (nargin > 0)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4275 retval = feval (args, nargout);
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4276 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	4277 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4278
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4279 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4280 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4281
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4282 DEFUN (builtin, args, nargout,
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4283 "-- texinfo --\n\
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4284 @deftypefn {Loadable Function} {[@dots{}]} builtin (@var{f}, @dots{})\n\
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4285 Call the base function @var{f} even if @var{f} is overloaded to\n\
11388 027fbc389898 Remove seealso reference to deprecated function dispatch. Rik <octave@nomad.inbox5.com> parents: 11367 diff changeset	4286 another function for the given type signature.\n\
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4287 @end deftypefn")
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4288 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	4289 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	4290
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4291 int nargin = args.length ();
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4292
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4293 if (nargin > 0)
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4294 {
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4295 const std::string name (args(0).string_value ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	4296
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4297 if (! error_state)
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4298 {
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4299 octave_value fcn = symbol_table::builtin_find (name);
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4300
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4301 if (fcn.is_defined ())
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4302 retval = feval (fcn.function_value (), args.splice (0, 1),
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4303 nargout);
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4304 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14189 diff changeset	4305 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	4306 }
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4307 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12400 diff changeset	4308 error ("builtin: function name (F) must be a string");
11225 8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4309 }
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4310 else
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4311 print_usage ();
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4312
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4313 return retval;
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4314 }
8d8e10058df6 move builtin function from dispatch.cc to oct-parse.yy John W. Eaton <jwe@octave.org> parents: 11138 diff changeset	4315
3099 8ce6fed79320 [project @ 1997-11-14 09:49:28 by jwe] jwe parents: 3095 diff changeset	4316 octave_value_list
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	4317 eval_string (const std::string& eval_str, bool silent,
b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	4318 int& parse_status, int nargout)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4319 {
3877 55648fc616c8 [project @ 2002-03-07 23:00:09 by jwe] jwe parents: 3844 diff changeset	4320 octave_value_list retval;
55648fc616c8 [project @ 2002-03-07 23:00:09 by jwe] jwe parents: 3844 diff changeset	4321
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	4322 unwind_protect frame;
6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	4323
16149 49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	4324 // octave_parser constructor sets this for us.
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	4325 frame.protect_var (CURR_LEXER);
49dfba4fd3c5 use pure parser and reentrant lexer interfaces John W. Eaton <jwe@octave.org> parents: 16147 diff changeset	4326
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	4327 octave_parser curr_parser (eval_str);
b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	4328
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	4329 frame.protect_var (line_editing);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4330
5189 85b315ad5f7d [project @ 2005-03-04 02:46:08 by jwe] jwe parents: 5180 diff changeset	4331 line_editing = false;
85b315ad5f7d [project @ 2005-03-04 02:46:08 by jwe] jwe parents: 5180 diff changeset	4332
3877 55648fc616c8 [project @ 2002-03-07 23:00:09 by jwe] jwe parents: 3844 diff changeset	4333 do
55648fc616c8 [project @ 2002-03-07 23:00:09 by jwe] jwe parents: 3844 diff changeset	4334 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	4335 curr_parser.reset ();
4318 115bffcecfd3 [project @ 2003-02-13 05:52:16 by jwe] jwe parents: 4297 diff changeset	4336
9260 9c2349a51218 properly unmark forced variables John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	4337 // Do this with an unwind-protect cleanup function so that the
9c2349a51218 properly unmark forced variables John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	4338 // forced variables will be unmarked in the event of an
9c2349a51218 properly unmark forced variables John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	4339 // interrupt.
9c2349a51218 properly unmark forced variables John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	4340 symbol_table::scope_id scope = symbol_table::top_scope ();
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	4341 frame.add_fcn (symbol_table::unmark_forced_variables, scope);
9260 9c2349a51218 properly unmark forced variables John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	4342
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	4343 parse_status = curr_parser.run ();
3877 55648fc616c8 [project @ 2002-03-07 23:00:09 by jwe] jwe parents: 3844 diff changeset	4344
9260 9c2349a51218 properly unmark forced variables John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	4345 // Unmark forced variables.
16177 a7669b4d27f6 eliminate global global_command variable John W. Eaton <jwe@octave.org> parents: 16174 diff changeset	4346 frame.run (1);
7903 8018e10d2b87 save and restore global_command as needed John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	4347
3883 69b6bd271277 [project @ 2002-04-02 21:05:10 by jwe] jwe parents: 3881 diff changeset	4348 if (parse_status == 0)
3877 55648fc616c8 [project @ 2002-03-07 23:00:09 by jwe] jwe parents: 3844 diff changeset	4349 {
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	4350 if (curr_parser.stmt_list)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4351 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4352 tree_statement *stmt = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4353
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	4354 if (curr_parser.stmt_list->length () == 1
490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	4355 && (stmt = curr_parser.stmt_list->front ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4356 && stmt->is_expression ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4357 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4358 tree_expression *expr = stmt->expression ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4359
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4360 if (silent)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4361 expr->set_print_flag (false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4362
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4363 bool do_bind_ans = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4364
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4365 if (expr->is_identifier ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4366 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4367 tree_identifier *id
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4368 = dynamic_cast<tree_identifier *> (expr);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4369
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4370 do_bind_ans = (! id->is_variable ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4371 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4372 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4373 do_bind_ans = (! expr->is_assignment_expression ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4374
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4375 retval = expr->rvalue (nargout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4376
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4377 if (do_bind_ans && ! (error_state \|\| retval.empty ()))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4378 bind_ans (retval(0), expr->print_result ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4379
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4380 if (nargout == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4381 retval = octave_value_list ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4382 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4383 else if (nargout == 0)
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	4384 curr_parser.stmt_list->accept (*current_evaluator);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4385 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4386 error ("eval: invalid use of statement list");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4387
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4388 if (error_state
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4389 \|\| tree_return_command::returning
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4390 \|\| tree_break_command::breaking
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4391 \|\| tree_continue_command::continuing)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4392 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4393 }
16187 490625211945 don't use new to create parser object John W. Eaton <jwe@octave.org> parents: 16177 diff changeset	4394 else if (curr_parser.curr_lexer->end_of_input)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4395 break;
3883 69b6bd271277 [project @ 2002-04-02 21:05:10 by jwe] jwe parents: 3881 diff changeset	4396 }
3877 55648fc616c8 [project @ 2002-03-07 23:00:09 by jwe] jwe parents: 3844 diff changeset	4397 }
55648fc616c8 [project @ 2002-03-07 23:00:09 by jwe] jwe parents: 3844 diff changeset	4398 while (parse_status == 0);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4399
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4400 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4401 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4402
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4403 octave_value
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	4404 eval_string (const std::string& eval_str, bool silent, int& parse_status)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4405 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4406 octave_value retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4407
16195 b52d2f9294b6 use class for reading lexer input John W. Eaton <jwe@octave.org> parents: 16187 diff changeset	4408 octave_value_list tmp = eval_string (eval_str, silent, parse_status, 1);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4409
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4410 if (! tmp.empty ())
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4411 retval = tmp(0);
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4412
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4413 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4414 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4415
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4416 static octave_value_list
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4417 eval_string (const octave_value& arg, bool silent, int& parse_status,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4418 int nargout)
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4419 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3489 diff changeset	4420 std::string s = arg.string_value ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4421
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4422 if (error_state)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4423 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3489 diff changeset	4424 error ("eval: expecting std::string argument");
4233 ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	4425 return octave_value (-1);
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4426 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4427
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4428 return eval_string (s, silent, parse_status, nargout);
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4429 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4430
13970 c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4431 void
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4432 cleanup_statement_list (tree_statement_list **lst)
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4433 {
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4434 if (*lst)
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4435 {
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4436 delete *lst;
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4437 *lst = 0;
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4438 }
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4439 }
c93b953f7d54 plug some memory leaks John W. Eaton <jwe@octave.org> parents: 13844 diff changeset	4440
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4441 DEFUN (eval, args, nargout,
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4442 "-- texinfo --\n\
14172 cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4443 @deftypefn {Built-in Function} {} eval (@var{try})\n\
cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4444 @deftypefnx {Built-in Function} {} eval (@var{try}, @var{catch})\n\
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4445 Parse the string @var{try} and evaluate it as if it were an Octave\n\
6643 6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4446 program. If that fails, evaluate the optional string @var{catch}.\n\
4463 322453495d75 [project @ 2003-07-12 05:03:33 by jwe] jwe parents: 4452 diff changeset	4447 The string @var{try} is evaluated in the current context,\n\
322453495d75 [project @ 2003-07-12 05:03:33 by jwe] jwe parents: 4452 diff changeset	4448 so any results remain available after @code{eval} returns.\n\
6643 6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4449 \n\
6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4450 The following example makes the variable @var{a} with the approximate\n\
6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4451 value 3.1416 available.\n\
6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4452 \n\
6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4453 @example\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14329 diff changeset	4454 eval (\"a = acos(-1);\");\n\
6643 6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4455 @end example\n\
6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4456 \n\
6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4457 If an error occurs during the evaluation of @var{try} the @var{catch}\n\
8828 8463d1a2e544 Doc fixes. Brian Gough <bjg@network-theory.co.uk> parents: 8819 diff changeset	4458 string is evaluated, as the following example shows:\n\
6643 6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4459 \n\
6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4460 @example\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	4461 @group\n\
6643 6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4462 eval ('error (\"This is a bad example\");',\n\
8015 30629059b72d Update the manual to reflect the changes in error output sh@sh-laptop parents: 8007 diff changeset	4463 'printf (\"This error occurred:\\n%s\\n\", lasterr ());');\n\
7001 8b0cfeb06365 [project @ 2007-10-10 18:02:59 by jwe] jwe parents: 6926 diff changeset	4464 @print{} This error occurred:\n\
8015 30629059b72d Update the manual to reflect the changes in error output sh@sh-laptop parents: 8007 diff changeset	4465 This is a bad example\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	4466 @end group\n\
6643 6a7fc4105bcc [project @ 2007-05-21 20:37:43 by jwe] jwe parents: 6637 diff changeset	4467 @end example\n\
14172 cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4468 \n\
cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4469 Consider using try/catch blocks instead if you are only using @code{eval}\n\
cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4470 as an error-capturing mechanism rather than for the execution of arbitrary\n\
cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4471 code strings.\n\
cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4472 @seealso{evalin}\n\
3371 86873384cd10 [project @ 1999-11-21 17:31:07 by jwe] jwe parents: 3366 diff changeset	4473 @end deftypefn")
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4474 {
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4475 octave_value_list retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4476
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4477 int nargin = args.length ();
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 (nargin > 0)
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4480 {
10067 6f79338c269b omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9794 diff changeset	4481 unwind_protect frame;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4482
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4483 if (nargin > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4484 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4485 frame.protect_var (buffer_error_messages);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4486 buffer_error_messages++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4487 }
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4488
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4489 int parse_status = 0;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4490
4463 322453495d75 [project @ 2003-07-12 05:03:33 by jwe] jwe parents: 4452 diff changeset	4491 octave_value_list tmp = eval_string (args(0), nargout > 0,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4492 parse_status, nargout);
4463 322453495d75 [project @ 2003-07-12 05:03:33 by jwe] jwe parents: 4452 diff changeset	4493
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4494 if (nargin > 1 && (parse_status != 0 \|\| error_state))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4495 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4496 error_state = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4497
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4498 // Set up for letting the user print any messages from
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4499 // errors that occurred in the first part of this eval().
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4500
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4501 buffer_error_messages--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4502
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4503 tmp = eval_string (args(1), nargout > 0, parse_status, nargout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4504
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4505 if (nargout > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4506 retval = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4507 }
8033 2ad5ba320b93 parse.y (Feval): Return value produced by evaluating CATCH string John W. Eaton <jwe@octave.org> parents: 8021 diff changeset	4508 else if (nargout > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4509 retval = tmp;
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4510 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4511 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	4512 print_usage ();
3021 18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4513
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4514 return retval;
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4515 }
18d64612e67a [project @ 1997-06-03 22:18:56 by jwe] jwe parents: 3016 diff changeset	4516
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4517 /*
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4518
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4519 %!shared x
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4520 %! x = 1;
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4521
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4522 %!assert (eval ("x"), 1)
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4523 %!assert (eval ("x;"))
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4524 %!assert (eval ("x;"), 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4525
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4526 %!test
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4527 %! y = eval ("x");
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4528 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4529
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4530 %!test
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4531 %! y = eval ("x;");
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4532 %! assert (y, 1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4533
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4534 %!test
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4535 %! eval ("x = 1;")
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4536 %! assert (x,1);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4537
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4538 %!test
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4539 %! eval ("flipud = 2;");
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4540 %! assert (flipud, 2);
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4541
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4542 %!function y = __f ()
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4543 %! eval ("flipud = 2;");
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4544 %! y = flipud;
14084 5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4545 %!endfunction
5aba9fa234cf Modernize %!tests for eval() Rik <octave@nomad.inbox5.com> parents: 13970 diff changeset	4546 %!assert (__f(), 2)
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4547
14533 e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	4548 % bug #35645
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	4549 %!test
e6aa044253eb Allow comma at the end of an assignment list (bug #35645) Max Brister <max@2bass.com> parents: 14512 diff changeset	4550 %! [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	4551 %! [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	4552
7562 c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4553 */
c827f5673321 move tests to individual source files John W. Eaton <jwe@octave.org> parents: 7351 diff changeset	4554
4661 12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4615 diff changeset	4555 DEFUN (assignin, args, ,
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4556 "-- texinfo --\n\
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4557 @deftypefn {Built-in Function} {} assignin (@var{context}, @var{varname}, @var{value})\n\
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4558 Assign @var{value} to @var{varname} in context @var{context}, which\n\
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4559 may be either @code{\"base\"} or @code{\"caller\"}.\n\
14172 cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4560 @seealso{evalin}\n\
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4561 @end deftypefn")
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4562 {
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4563 octave_value_list retval;
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4564
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4565 int nargin = args.length ();
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4566
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4567 if (nargin == 3)
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4568 {
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4569 std::string context = args(0).string_value ();
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4570
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4571 if (! error_state)
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4572 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4573 unwind_protect frame;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4574
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4575 if (context == "caller")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4576 octave_call_stack::goto_caller_frame ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4577 else if (context == "base")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4578 octave_call_stack::goto_base_frame ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4579 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12400 diff changeset	4580 error ("assignin: CONTEXT must be \"caller\" or \"base\"");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4581
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4582 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4583 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4584 frame.add_fcn (octave_call_stack::pop);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4585
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4586 std::string nm = args(1).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4587
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4588 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4589 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4590 if (valid_identifier (nm))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4591 symbol_table::varref (nm) = args(2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4592 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12400 diff changeset	4593 error ("assignin: invalid variable name in argument VARNAME");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4594 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4595 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12400 diff changeset	4596 error ("assignin: VARNAME must be a string");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4597 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4598 }
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4599 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12400 diff changeset	4600 error ("assignin: CONTEXT must be a string");
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4601 }
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4602 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	4603 print_usage ();
4297 59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4604
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4605 return retval;
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4606 }
59a2ba0fb205 [project @ 2003-01-11 20:22:09 by jwe] jwe parents: 4246 diff changeset	4607
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4608 DEFUN (evalin, args, nargout,
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4609 "-- texinfo --\n\
14172 cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4610 @deftypefn {Built-in Function} {} evalin (@var{context}, @var{try})\n\
cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4611 @deftypefnx {Built-in Function} {} evalin (@var{context}, @var{try}, @var{catch})\n\
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4612 Like @code{eval}, except that the expressions are evaluated in the\n\
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4613 context @var{context}, which may be either @code{\"caller\"} or\n\
4246 0253850a08d7 [project @ 2002-12-30 17:57:36 by jwe] jwe parents: 4245 diff changeset	4614 @code{\"base\"}.\n\
14172 cba1c681f1b7 doc: Update seealso references for eval family of functions. Rik <octave@nomad.inbox5.com> parents: 14153 diff changeset	4615 @seealso{eval, assignin}\n\
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4616 @end deftypefn")
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4617 {
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4618 octave_value_list retval;
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4619
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4620 int nargin = args.length ();
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4621
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4622 if (nargin > 1)
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4623 {
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4624 std::string context = args(0).string_value ();
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4625
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4626 if (! error_state)
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4627 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4628 unwind_protect frame;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4629
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4630 if (context == "caller")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4631 octave_call_stack::goto_caller_frame ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4632 else if (context == "base")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4633 octave_call_stack::goto_base_frame ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4634 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12400 diff changeset	4635 error ("evalin: CONTEXT must be \"caller\" or \"base\"");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4636
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4637 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4638 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4639 frame.add_fcn (octave_call_stack::pop);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4640
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4641 if (nargin > 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4642 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4643 frame.protect_var (buffer_error_messages);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4644 buffer_error_messages++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4645 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4646
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4647 int parse_status = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4648
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4649 octave_value_list tmp = eval_string (args(1), nargout > 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4650 parse_status, nargout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4651
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4652 if (nargout > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4653 retval = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4654
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4655 if (nargin > 2 && (parse_status != 0 \|\| error_state))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4656 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4657 error_state = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4658
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4659 // Set up for letting the user print any messages from
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4660 // errors that occurred in the first part of this eval().
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4661
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4662 buffer_error_messages--;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4663
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4664 tmp = eval_string (args(2), nargout > 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4665 parse_status, nargout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4666
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4667 retval = (nargout > 0) ? tmp : octave_value_list ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4668 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4669 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	4670 }
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4671 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12400 diff changeset	4672 error ("evalin: CONTEXT must be a string");
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4673 }
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4674 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5794 diff changeset	4675 print_usage ();
4245 610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4676
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4677 return retval;
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4678 }
610671be8792 [project @ 2002-12-28 04:02:31 by jwe] jwe parents: 4244 diff changeset	4679
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4680 DEFUN (__parser_debug_flag__, args, nargout,
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	4681 "-- texinfo --\n\
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	4682 @deftypefn {Built-in Function} {@var{old_val} =} __parser_debug_flag__ (@var{new_val}))\n\
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	4683 Undocumented internal function.\n\
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8746 diff changeset	4684 @end deftypefn")
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4685 {
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4686 octave_value retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4687
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4688 bool debug_flag = octave_debug;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4689
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4690 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	4691 "__parser_debug_flag__");
8311 7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4692
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4693 octave_debug = debug_flag;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4694
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4695 return retval;
7124bffc89c7 parse.y (F__parser_debug_flag__): New function. John W. Eaton <jwe@octave.org> parents: 8283 diff changeset	4696 }

Mercurial > octave

annotate libinterp/parse-tree/oct-parse.in.yy @ 16205:a8f9eb92fa6e classdef