octave: libinterp/parse-tree/oct-parse.yy comparison

comparison libinterp/parse-tree/oct-parse.yy @ 27762:80d68a3e8ec0

make location info available for more tokens in parser * oct-parse.yy: Use tok_val instead of dummy_type for single character tokens '(' ')' '[' ']' '{' '}' '.' '@' ',' ';' '\n'. For now, tag all as unused in the grammer.

author	John W. Eaton <jwe@octave.org>
date	Mon, 02 Dec 2019 01:16:12 -0600
parents	7a45100a40c4
children	f64e399b6dda

comparison

equal deleted inserted replaced

-:223981108144
+:80d68a3e8ec0
 octave::tree_classdef_enum_block* tree_classdef_enum_block_type;
 }
 // Tokens with line and column information.
 %token <tok_val> '=' ':' '-' '+' '*' '/'
+%token <tok_val> '(' ')' '[' ']' '{' '}' '.' '@'
+%token <tok_val> ',' ';' '\n'
 %token <tok_val> ADD_EQ SUB_EQ MUL_EQ DIV_EQ LEFTDIV_EQ POW_EQ
 %token <tok_val> EMUL_EQ EDIV_EQ ELEFTDIV_EQ EPOW_EQ AND_EQ OR_EQ
 %token <tok_val> EXPR_AND_AND EXPR_OR_OR
 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT
 %token <tok_val> EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT
 // Other tokens.
 %token<dummy_type> END_OF_INPUT
 %token<dummy_type> INPUT_FILE
 // %token VARARGIN VARARGOUT
-%token<dummy_type> '(' ')' '[' ']' '{' '}' '.' ',' ';' '@' '\n'
 // Nonterminals we construct.
 %type <dummy_type> indirect_ref_op decl_param_init
 %type <dummy_type> push_fcn_symtab push_script_symtab begin_file
 %type <dummy_type> param_list_beg param_list_end stmt_begin anon_fcn_begin
 // Statements and statement lists
 // ==============================
 input           : simple_list '\n'
 {
+YYUSE ($2);
 $$ = nullptr;
 parser.statement_list (std::shared_ptr<octave::tree_statement_list> ($1));
 YYACCEPT;
 }
 | simple_list END_OF_INPUT
 | string
 { $$ = $1; }
 ;
 matrix          : '[' matrix_rows ']'
-{ $$ = parser.finish_matrix ($2); }
+{
+YYUSE ($1);
+YYUSE ($3);
+$$ = parser.finish_matrix ($2);
+}
 ;
 matrix_rows     : cell_or_matrix_row
 { $$ = $1 ? new octave::tree_matrix ($1) : nullptr; }
 | matrix_rows ';' cell_or_matrix_row
 {
+YYUSE ($2);
 if ($1)
 {
 if ($3)
 $1->append ($3);
 $$ = $3 ? new octave::tree_matrix ($3) : nullptr;
 }
 ;
 cell            : '{' cell_rows '}'
-{ $$ = parser.finish_cell ($2); }
+{
+YYUSE ($1);
+YYUSE ($3);
+$$ = parser.finish_cell ($2);
+}
 ;
 cell_rows       : cell_or_matrix_row
 { $$ = $1 ? new octave::tree_cell ($1) : nullptr; }
 | cell_rows ';' cell_or_matrix_row
 {
+YYUSE ($2);
 if ($1)
 {
 if ($3)
 $1->append ($3);
 cell_or_matrix_row
 : // empty
 { $$ = nullptr; }
 | ','
-{ $$ = nullptr; }
+{
+YYUSE ($1);
+$$ = nullptr;
+}
 | arg_list
 { $$ = $1; }
 | arg_list ','
-{ $$ = $1; }
+{
+YYUSE ($2);
+$$ = $1;
+}
 | ',' arg_list
-{ $$ = $2; }
+{
+YYUSE ($1);
+$$ = $2;
+}
 | ',' arg_list ','
-{ $$ = $2; }
+{
+YYUSE ($1);
+YYUSE ($3);
+$$ = $2;
+}
 ;
 fcn_handle      : FCN_HANDLE
 { $$ = parser.make_fcn_handle ($1); }
 ;
 // flag after recognizing the parameter list because we don't want to
 // accept word list commands in anonymous function bodies.
 anon_fcn_handle : '@' param_list anon_fcn_begin expression
 {
+YYUSE ($1);
 $$ = parser.make_anon_fcn_handle ($2, $4);
 if (! $$)
 {
 // make_anon_fcn_handle deleted $2 and $4.
 YYABORT;
 lexer.m_parsing_anon_fcn_body = false;
 lexer.m_nesting_level.remove ();
 }
 | '@' param_list anon_fcn_begin error
 {
+YYUSE ($1);
 YYUSE ($2);
 lexer.m_parsing_anon_fcn_body = false;
 $$ = nullptr;
 | meta_identifier
 { $$ = $1; }
 | superclass_identifier
 { $$ = $1; }
 | '(' expression ')'
-{ $$ = $2->mark_in_parens (); }
+{
+YYUSE ($1);
+YYUSE ($3);
+$$ = $2->mark_in_parens ();
+}
 ;
 magic_colon     : ':'
 {
 YYUSE ($1);
 { $$ = new octave::tree_argument_list ($1); }
 | magic_tilde
 { $$ = new octave::tree_argument_list ($1); }
 | arg_list ',' magic_colon
 {
+YYUSE ($2);
 $1->append ($3);
 $$ = $1;
 }
 | arg_list ',' magic_tilde
 {
+YYUSE ($2);
 $1->append ($3);
 $$ = $1;
 }
 | arg_list ',' expression
 {
+YYUSE ($2);
 $1->append ($3);
 $$ = $1;
 }
 ;
 indirect_ref_op : '.'
 {
+YYUSE ($1);
 $$ = 0;
 lexer.m_looking_at_indirect_ref = true;
 }
 ;
 { $$ = parser.make_postfix_op (PLUS_PLUS, $1, $2); }
 | oper_expr MINUS_MINUS
 { $$ = parser.make_postfix_op (MINUS_MINUS, $1, $2); }
 | oper_expr '(' ')'
 {
+YYUSE ($2);
+YYUSE ($3);
 $$ = parser.make_index_expression ($1, nullptr, '(');
 if (! $$)
 {
 // make_index_expression deleted $1.
 YYABORT;
 }
 }
 | oper_expr '(' arg_list ')'
 {
+YYUSE ($2);
+YYUSE ($4);
 $$ = parser.make_index_expression ($1, $3, '(');
 if (! $$)
 {
 // make_index_expression deleted $1 and $3.
 YYABORT;
 }
 }
 | oper_expr '{' '}'
 {
+YYUSE ($2);
+YYUSE ($3);
 $$ = parser.make_index_expression ($1, nullptr, '{');
 if (! $$)
 {
 // make_index_expression deleted $1.
 YYABORT;
 }
 }
 | oper_expr '{' arg_list '}'
 {
+YYUSE ($2);
+YYUSE ($4);
 $$ = parser.make_index_expression ($1, $3, '{');
 if (! $$)
 {
 // make_index_expression deleted $1 and $3.
 YYABORT;
 | oper_expr TRANSPOSE
 { $$ = parser.make_postfix_op (TRANSPOSE, $1, $2); }
 | oper_expr indirect_ref_op STRUCT_ELT
 { $$ = parser.make_indirect_ref ($1, $3->text ()); }
 | oper_expr indirect_ref_op '(' expression ')'
-{ $$ = parser.make_indirect_ref ($1, $4); }
+{
+YYUSE ($3);
+YYUSE ($5);
+$$ = parser.make_indirect_ref ($1, $4);
+}
 | PLUS_PLUS oper_expr %prec UNARY
 { $$ = parser.make_prefix_op (PLUS_PLUS, $2, $1); }
 | MINUS_MINUS oper_expr %prec UNARY
 { $$ = parser.make_prefix_op (MINUS_MINUS, $2, $1); }
 | EXPR_NOT oper_expr %prec UNARY
 { $$ = parser.make_postfix_op (PLUS_PLUS, $1, $2); }
 | power_expr MINUS_MINUS
 { $$ = parser.make_postfix_op (MINUS_MINUS, $1, $2); }
 | power_expr '(' ')'
 {
+YYUSE ($2);
+YYUSE ($3);
 $$ = parser.make_index_expression ($1, nullptr, '(');
 if (! $$)
 {
 // make_index_expression deleted $1.
 YYABORT;
 }
 }
 | power_expr '(' arg_list ')'
 {
+YYUSE ($2);
+YYUSE ($4);
 $$ = parser.make_index_expression ($1, $3, '(');
 if (! $$)
 {
 // make_index_expression deleted $1 and $3.
 YYABORT;
 }
 }
 | power_expr '{' '}'
 {
+YYUSE ($2);
+YYUSE ($3);
 $$ = parser.make_index_expression ($1, nullptr, '{');
 if (! $$)
 {
 // make_index_expression deleted $1.
 YYABORT;
 }
 }
 | power_expr '{' arg_list '}'
 {
+YYUSE ($2);
+YYUSE ($4);
 $$ = parser.make_index_expression ($1, $3, '{');
 if (! $$)
 {
 // make_index_expression deleted $1 and $3.
 YYABORT;
 }
 }
 | power_expr indirect_ref_op STRUCT_ELT
 { $$ = parser.make_indirect_ref ($1, $3->text ()); }
 | power_expr indirect_ref_op '(' expression ')'
-{ $$ = parser.make_indirect_ref ($1, $4); }
+{
+YYUSE ($3);
+YYUSE ($5);
+$$ = parser.make_indirect_ref ($1, $4);
+}
 | PLUS_PLUS power_expr %prec POW
 { $$ = parser.make_prefix_op (PLUS_PLUS, $2, $1); }
 | MINUS_MINUS power_expr %prec POW
 { $$ = parser.make_prefix_op (MINUS_MINUS, $2, $1); }
 | EXPR_NOT power_expr %prec POW
 YYABORT;
 }
 }
 | FOR stash_comment '(' assign_lhs '=' expression ')' opt_sep opt_list END
 {
+YYUSE ($3);
 YYUSE ($5);
+YYUSE ($7);
 YYUSE ($8);
 if (! ($$ = parser.make_for_command (FOR, $1, $4, $6,
 nullptr, $9, $10, $2)))
 {
 YYABORT;
 }
 }
 | PARFOR stash_comment '(' assign_lhs '=' expression ',' expression ')' opt_sep opt_list END
 {
+YYUSE ($3);
 YYUSE ($5);
+YYUSE ($7);
+YYUSE ($9);
 YYUSE ($10);
 if (! ($$ = parser.make_for_command (PARFOR, $1, $4, $6,
 $8, $11, $12, $2)))
 {
 // List of function parameters
 // ===========================
 param_list_beg  : '('
 {
+YYUSE ($1);
 $$ = 0;
 lexer.m_looking_at_parameter_list = true;
 if (lexer.m_looking_at_function_handle)
 {
 }
 ;
 param_list_end  : ')'
 {
+YYUSE ($1);
 $$ = 0;
 lexer.m_looking_at_parameter_list = false;
 lexer.m_looking_for_object_index = false;
 }
 ;
 param_list2     : param_list_elt
 { $$ = new octave::tree_parameter_list ($1); }
 | param_list2 ',' param_list_elt
 {
+YYUSE ($2);
 $1->append ($3);
 $$ = $1;
 }
 ;
 // List of function return value names
 // ===================================
 return_list     : '[' ']'
 {
+YYUSE ($1);
+YYUSE ($2);
 lexer.m_looking_at_return_list = false;
 $$ = new octave::tree_parameter_list ();
 }
 | identifier
 YYABORT;
 }
 }
 | '[' return_list1 ']'
 {
+YYUSE ($1);
+YYUSE ($3);
 lexer.m_looking_at_return_list = false;
 // Check for duplicate parameter names, varargin,
 // or varargout.
 return_list1    : identifier
 { $$ = new octave::tree_parameter_list (new octave::tree_decl_elt ($1)); }
 | return_list1 ',' identifier
 {
+YYUSE ($2);
 $1->append (new octave::tree_decl_elt ($3));
 $$ = $1;
 }
 ;
 }
 }
 | GET '.' identifier
 {
 YYUSE ($1);
+YYUSE ($2);
 lexer.m_parsed_function_name.top () = true;
 lexer.m_maybe_classdef_get_set_method = false;
 lexer.m_parsing_classdef_get_method = true;
 $$ = $3;
 }
 | SET '.' identifier
 {
 YYUSE ($1);
+YYUSE ($2);
 lexer.m_parsed_function_name.top () = true;
 lexer.m_maybe_classdef_get_set_method = false;
 lexer.m_parsing_classdef_set_method = true;
 $$ = $3;
 ;
 opt_attr_list   : // empty
 { $$ = nullptr; }
 | '(' attr_list ')'
-{ $$ = $2; }
+{
+YYUSE ($1);
+YYUSE ($3);
+$$ = $2;
+}
 ;
 attr_list       : attr
 { $$ = new octave::tree_classdef_attribute_list ($1); }
 | attr_list ',' attr
 {
+YYUSE ($2);
 $1->append ($3);
 $$ = $1;
 }
 ;
 $$ = $1;
 }
 ;
 class_enum      : identifier '(' expression ')'
-{ $$ = new octave::tree_classdef_enum ($1, $3); }
+{
+YYUSE ($2);
+YYUSE ($4);
+$$ = new octave::tree_classdef_enum ($1, $3);
+}
 ;
 // =============
 // Miscellaneous
 // =============
 | error
 { $$ = 0; }
 ;
 sep_no_nl       : ','
-{ $$ = ','; }
+{
+YYUSE ($1);
+$$ = ',';
+}
 | ';'
-{ $$ = ';'; }
+{
+YYUSE ($1);
+$$ = ';';
+}
 | sep_no_nl ','
-{ $$ = $1; }
+{
+YYUSE ($2);
+$$ = $1;
+}
 | sep_no_nl ';'
-{ $$ = $1; }
+{
+YYUSE ($2);
+$$ = $1;
+}
 ;
 opt_sep_no_nl   : // empty
 { $$ = 0; }
 | sep_no_nl
 | nl
 { $$ = $1; }
 ;
 nl              : '\n'
-{ $$ = '\n'; }
+{
+YYUSE ($1);
+$$ = '\n';
+}
 | nl '\n'
-{ $$ = $1; }
+{
+YYUSE ($2);
+$$ = $1;
+}
 ;
 sep             : ','
-{ $$ = ','; }
+{
+YYUSE ($1);
+$$ = ',';
+}
 | ';'
-{ $$ = ';'; }
+{
+YYUSE ($1);
+$$ = ';';
+}
 | '\n'
-{ $$ = '\n'; }
+{
+YYUSE ($1);
+$$ = '\n';
+}
 | sep ','
-{ $$ = $1; }
+{
+YYUSE ($2);
+$$ = $1;
+}
 | sep ';'
-{ $$ = $1; }
+{
+YYUSE ($2);
+$$ = $1;
+}
 | sep '\n'
-{ $$ = $1; }
+{
+YYUSE ($2);
+$$ = $1;
+}
 ;
 opt_sep         : // empty
 { $$ = 0; }
 | sep

Mercurial > octave

comparison libinterp/parse-tree/oct-parse.yy @ 27762:80d68a3e8ec0