octave: libinterp/parse-tree/token.h annotate

annotate libinterp/parse-tree/token.h @ 20075:8aa424ffc076

handle all end token types when reporting parse errors (bug #44824) * oct-parse.in.yy (octave_base_parser::end_error, octave_base_parser::end_token_ok): Handle all end token types in switch statement. Alphabetize list of cases (after simple_end). * token.h (end_tok_type): Alphabetize list of token types (after simple_end).

author	John W. Eaton <jwe@octave.org>
date	Mon, 13 Apr 2015 23:41:08 -0400
parents	734a77207e2e
children	f7084eae3318

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
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 18520 diff changeset	3 Copyright (C) 1993-2015 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
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	36 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	37 generic_token,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	38 keyword_token,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	39 string_token,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	40 double_token,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	41 ettype_token,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	42 sym_rec_token,
17856 97e49b588f5d maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 17745 17787 diff changeset	43 scls_name_token,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	44 };
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 enum end_tok_type
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	47 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	48 simple_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	49 classdef_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	50 enumeration_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	51 events_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	52 for_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	53 function_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	54 if_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	55 methods_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	56 parfor_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	57 properties_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	58 switch_end,
20075 8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19859 diff changeset	59 try_catch_end,
8aa424ffc076 handle all end token types when reporting parse errors (bug #44824) John W. Eaton <jwe@octave.org> parents: 19859 diff changeset	60 unwind_protect_end,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	61 while_end,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	62 };
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	63
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	64 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	65 token (int tv, bool is_keyword, int l = -1, int c = -1);
19858 77f65eabac20 avoid crash when __FILE__ is used at top level (bug #44363) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	66 token (int tv, const char *s, 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);
18520 932aca9a7c57 Allow multi-level classdef package. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	72 token (int tv, const std::string& mth, const std::string& cls,
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	73 int l = -1, int c = -1);
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	74
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1489 diff changeset	75 ~token (void);
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	76
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	77 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	78 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	79
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	80 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	81 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	82
12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	83 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	84 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	85
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	86 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	87 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	88
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	89 bool is_keyword (void) const
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	90 {
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	91 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	92 }
15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	93
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	94 bool is_symbol (void) const
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	95 {
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	96 return type_tag == sym_rec_token;
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	97 }
11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	98
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	99 std::string text (void) const;
16360 11115c237231 recognize variables when parsing (bug #38576) John W. Eaton <jwe@octave.org> parents: 16267 diff changeset	100 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	101 double number (void) const;
16267 15f55df088e7 6/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16257 diff changeset	102 token_type ttype (void) const;
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	103 end_tok_type ettype (void) const;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	104 symbol_table::symbol_record *sym_rec (void);
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	105
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	106 std::string superclass_method_name (void);
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	107 std::string superclass_class_name (void);
9476 d9b25c5b8ee5 handle classdef syntax in lexer and parser Ryan Rusaw parents: 8920 diff changeset	108
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 2847 diff changeset	109 std::string text_rep (void);
581 bc813f5eb025 [project @ 1994-08-07 01:02:15 by jwe] jwe parents: 476 diff changeset	110
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	111 private:
3552 41daa489833a [project @ 2000-02-03 03:05:28 by jwe] jwe parents: 3548 diff changeset	112
41daa489833a [project @ 2000-02-03 03:05:28 by jwe] jwe parents: 3548 diff changeset	113 // No copying!
41daa489833a [project @ 2000-02-03 03:05:28 by jwe] jwe parents: 3548 diff changeset	114
1288 4acabfbdd381 [project @ 1995-04-28 20:23:04 by jwe] jwe parents: 1009 diff changeset	115 token (const token& tok);
3552 41daa489833a [project @ 2000-02-03 03:05:28 by jwe] jwe parents: 3548 diff changeset	116
1288 4acabfbdd381 [project @ 1995-04-28 20:23:04 by jwe] jwe parents: 1009 diff changeset	117 token& operator = (const token& tok);
4acabfbdd381 [project @ 1995-04-28 20:23:04 by jwe] jwe parents: 1009 diff changeset	118
16257 db7f07b22b9b 1/10 commits reworking the lexer John W. Eaton <jwe@octave.org> parents: 16255 diff changeset	119 bool maybe_cmd;
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	120 bool tspc;
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	121 int line_num;
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	122 int column_num;
16255 12bf6a3f8c45 store more info in token value class John W. Eaton <jwe@octave.org> parents: 16134 diff changeset	123 int tok_val;
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	124 token_type type_tag;
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	125 union
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	126 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	127 std::string *str;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	128 double num;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	129 end_tok_type et;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	130 symbol_table::symbol_record *sr;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	131 struct
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	132 {
17856 97e49b588f5d maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 17745 17787 diff changeset	133 std::string *method_nm;
97e49b588f5d maint: periodic merge of default to classdef John W. Eaton <jwe@octave.org> parents: 17745 17787 diff changeset	134 std::string *class_nm;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	135 } sc;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	136 };
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 2847 diff changeset	137 std::string orig_text;
142 6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	138 };
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	139
6906d6591452 [project @ 1993-10-04 00:40:57 by jwe] jwe parents: diff changeset	140 #endif

Mercurial > octave

annotate libinterp/parse-tree/token.h @ 20075:8aa424ffc076