Mercurial > octave

annotate libinterp/parse-tree/token.h @ 16360:11115c237231

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
recognize variables when parsing (bug #38576) * lex.h, lex.ll (lexical_feedback::mark_as_variable, lexical_feedback::maybe_mark_previous_token_as_variable, lexical_feedback::mark_as_variables, octave_lexer::is_variable): New fucntions. ("="): Call maybe_mark_previous_toke_as_variable. (handle_identifier): Don't tag variables as possible commands. (param_list): Mark names in list as variables. (octave_base_parser::validate_matrix_for_assignment): Likewise. * pt-arg-list.h, pt-arg-list.cc (tree_argument_list::variable_names): New function. * pt-misc.h, pt-misc.cc (tree_parameter_list::variable_names): New function. * token.h, token.cc (token::symbol_name, token::is_symbol): New functions. * test/bug-38576.tst: New file. * test/Makefile.am (FCN_FILES): Add bug-38576.tst to the list.
author John W. Eaton <jwe@octave.org>
date Sat, 23 Mar 2013 15:02:29 -0400
parents 15f55df088e7
children 2ed5bc680c71 d63878346099
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
1 /*
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
2
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 13249
diff changeset
3 Copyright (C) 1993-2012 John W. Eaton
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
4
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
6
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
8 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: 5307
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
10 option) any later version.
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
11
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
15 for more details.
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
16
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
17 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: 5307
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
19 <http://www.gnu.org/licenses/>.
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
20
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
21 */
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
22
383
0b52c68ec81f [project @ 1994-03-09 21:19:44 by jwe]
jwe
parents: 240
diff changeset
23 #if !defined (octave_token_h)
0b52c68ec81f [project @ 1994-03-09 21:19:44 by jwe]
jwe
parents: 240
diff changeset
24 #define octave_token_h 1
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
25
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1489
diff changeset
26 #include <string>
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1489
diff changeset
27
16134
ec9c6222ef5a move static parser helper functions to octave_parser class
John W. Eaton <jwe@octave.org>
parents: 15195
diff changeset
28 #include "symtab.h"
ec9c6222ef5a move static parser helper functions to octave_parser class
John W. Eaton <jwe@octave.org>
parents: 15195
diff changeset
29
453
393e95f46b51 [project @ 1994-06-06 00:05:20 by jwe]
jwe
parents: 383
diff changeset
30 class
393e95f46b51 [project @ 1994-06-06 00:05:20 by jwe]
jwe
parents: 383
diff changeset
31 token
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
32 {
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
33 public:
3548
ab7fa5a8f23f [project @ 2000-02-03 01:17:15 by jwe]
jwe
parents: 3523
diff changeset
34
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
35 enum token_type
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
36 {
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
37 generic_token,
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
38 keyword_token,
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
39 string_token,
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
40 double_token,
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
41 ettype_token,
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
42 sym_rec_token,
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
43 scls_rec_token,
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
44 meta_rec_token
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
45 };
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
46
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
47 enum end_tok_type
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
48 {
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
49 simple_end,
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
50 classdef_end,
13249
7861a5fd3479 accept enumeration keyword
John W. Eaton <jwe@octave.org>
parents: 13245
diff changeset
51 enumeration_end,
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
52 events_end,
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
53 for_end,
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
54 function_end,
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
55 if_end,
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
56 methods_end,
13245
027a2186cd90 parfor keyword and infrastructure, but handle parfor as normal for loop for now
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
57 parfor_end,
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
58 properties_end,
2764
2c0f259cf83d [project @ 1997-03-01 02:30:26 by jwe]
jwe
parents: 1996
diff changeset
59 switch_end,
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
60 while_end,
1489
3e705c864019 [project @ 1995-09-28 05:38:26 by jwe]
jwe
parents: 1315
diff changeset
61 try_catch_end,
3548
ab7fa5a8f23f [project @ 2000-02-03 01:17:15 by jwe]
jwe
parents: 3523
diff changeset
62 unwind_protect_end
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
63 };
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
64
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
65 token (int tv, int l = -1, int c = -1);
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
66 token (int tv, bool is_keyword, int l = -1, int c = -1);
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
67 token (int tv, const std::string& s, int l = -1, int c = -1);
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
68 token (int tv, double d, const std::string& s = std::string (),
10313
f3b65e1ae355 untabify src header files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
69 int l = -1, int c = -1);
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
70 token (int tv, end_tok_type t, int l = -1, int c = -1);
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
71 token (int tv, symbol_table::symbol_record *s, int l = -1, int c = -1);
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
72 token (int tv, symbol_table::symbol_record *cls,
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
73 symbol_table::symbol_record *pkg, int l = -1, int c = -1);
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
74 token (int tv, symbol_table::symbol_record *mth,
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
75 symbol_table::symbol_record *cls,
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
76 symbol_table::symbol_record *pkg, int l = -1, int c = -1);
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
77
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1489
diff changeset
78 ~token (void);
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
79
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
80 void mark_may_be_command (void) { maybe_cmd = true; }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
81 bool may_be_command (void) const { return maybe_cmd; }
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
82
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
83 void mark_trailing_space (void) { tspc = true; }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
84 bool space_follows_token (void) const { return tspc; }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
85
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
86 int token_value (void) const { return tok_val; }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
87 bool token_value_is (int tv) const { return tv == tok_val; }
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
88
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
89 int line (void) const { return line_num; }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
90 int column (void) const { return column_num; }
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
91
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
92 bool is_keyword (void) const
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
93 {
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
94 return type_tag == keyword_token || type_tag == ettype_token;
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
95 }
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
96
16360
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
97 bool is_symbol (void) const
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
98 {
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
99 return type_tag == sym_rec_token;
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
100 }
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
101
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
102 std::string text (void) const;
16360
11115c237231 recognize variables when parsing (bug #38576)
John W. Eaton <jwe@octave.org>
parents: 16267
diff changeset
103 std::string symbol_name (void) const;
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
104 double number (void) const;
16267
15f55df088e7 6/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16257
diff changeset
105 token_type ttype (void) const;
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
106 end_tok_type ettype (void) const;
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7017
diff changeset
107 symbol_table::symbol_record *sym_rec (void);
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
108
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
109 symbol_table::symbol_record *method_rec (void);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
110 symbol_table::symbol_record *class_rec (void);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
111 symbol_table::symbol_record *package_rec (void);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
112
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
113 symbol_table::symbol_record *meta_class_rec (void);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
114 symbol_table::symbol_record *meta_package_rec (void);
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
115
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 2847
diff changeset
116 std::string text_rep (void);
581
bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe]
jwe
parents: 476
diff changeset
117
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
118 private:
3552
41daa489833a [project @ 2000-02-03 03:05:28 by jwe]
jwe
parents: 3548
diff changeset
119
41daa489833a [project @ 2000-02-03 03:05:28 by jwe]
jwe
parents: 3548
diff changeset
120 // No copying!
41daa489833a [project @ 2000-02-03 03:05:28 by jwe]
jwe
parents: 3548
diff changeset
121
1288
4acabfbdd381 [project @ 1995-04-28 20:23:04 by jwe]
jwe
parents: 1009
diff changeset
122 token (const token& tok);
3552
41daa489833a [project @ 2000-02-03 03:05:28 by jwe]
jwe
parents: 3548
diff changeset
123
1288
4acabfbdd381 [project @ 1995-04-28 20:23:04 by jwe]
jwe
parents: 1009
diff changeset
124 token& operator = (const token& tok);
4acabfbdd381 [project @ 1995-04-28 20:23:04 by jwe]
jwe
parents: 1009
diff changeset
125
16257
db7f07b22b9b 1/10 commits reworking the lexer
John W. Eaton <jwe@octave.org>
parents: 16255
diff changeset
126 bool maybe_cmd;
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
127 bool tspc;
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
128 int line_num;
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
129 int column_num;
16255
12bf6a3f8c45 store more info in token value class
John W. Eaton <jwe@octave.org>
parents: 16134
diff changeset
130 int tok_val;
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
131 token_type type_tag;
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
132 union
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
133 {
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 2847
diff changeset
134 std::string *str;
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
135 double num;
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
136 end_tok_type et;
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7017
diff changeset
137 symbol_table::symbol_record *sr;
9476
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
138 struct
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
139 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
140 symbol_table::symbol_record *mr;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
141 symbol_table::symbol_record *cr;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
142 symbol_table::symbol_record *pr;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
143 } sc;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
144 struct
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
145 {
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
146 symbol_table::symbol_record *cr;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
147 symbol_table::symbol_record *pr;
d9b25c5b8ee5 handle classdef syntax in lexer and parser
Ryan Rusaw
parents: 8920
diff changeset
148 } mc;
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
149 };
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 2847
diff changeset
150 std::string orig_text;
142
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
151 };
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
152
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe]
jwe
parents:
diff changeset
153 #endif