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

comparison libinterp/parse-tree/oct-parse.yy @ 30145:cd6f7957c889

* oct-parse.yy (OCTAVE_YYUSE): Use variadic macro.

author	John W. Eaton <jwe@octave.org>
date	Thu, 09 Sep 2021 13:36:50 -0400
parents	3c2dee80b542
children	f692ecc135d6

comparison

equal deleted inserted replaced

-:3c2dee80b542
+:cd6f7957c889
 // warnings about unused values in rules.  But that Bison macro was
 // apparently never intended to be public.  So define our own.  All we
 // need to do is mention the symantic value somewhere in the rule.  It
 // doesn't actually need to be used to avoid the Bison warning, so just
 // define this macro to discard its parameter.
-#define OCTAVE_YYUSE(X)
+#define OCTAVE_YYUSE(X, ...)
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
 // Disable this warning for code that is generated by Bison,
 // including grammar rules.  Push the current state so we can
 // restore the warning state prior to functions we define at
 $$ = $2;
 }
 | ',' arg_list ','
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $3);
-OCTAVE_YYUSE ($3);
 $$ = $2;
 }
 ;
 lexer.m_parsing_anon_fcn_body = false;
 lexer.m_nesting_level.remove ();
 }
 | '@' param_list anon_fcn_begin error
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $2);
-OCTAVE_YYUSE ($2);
 lexer.m_parsing_anon_fcn_body = false;
 $$ = nullptr;
 parser.bison_error ("anonymous function bodies must be single expressions");
 { $$ = $1; }
 | superclass_identifier
 { $$ = $1; }
 | '(' expression ')'
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $3);
-OCTAVE_YYUSE ($3);
 $$ = $2->mark_in_parens ();
 }
 ;
 { $$ = parser.make_postfix_op (PLUS_PLUS, $1, $2); }
 | oper_expr MINUS_MINUS
 { $$ = parser.make_postfix_op (MINUS_MINUS, $1, $2); }
 | oper_expr '(' ')'
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $3);
-OCTAVE_YYUSE ($3);
 $$ = parser.make_index_expression ($1, nullptr, '(');
 if (! $$)
 {
 // make_index_expression deleted $1.
 YYABORT;
 }
 }
 | oper_expr '(' arg_list ')'
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $4);
-OCTAVE_YYUSE ($4);
 $$ = parser.make_index_expression ($1, $3, '(');
 if (! $$)
 {
 // make_index_expression deleted $1 and $3.
 YYABORT;
 }
 }
 | oper_expr '{' '}'
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $3);
-OCTAVE_YYUSE ($3);
 $$ = parser.make_index_expression ($1, nullptr, '{');
 if (! $$)
 {
 // make_index_expression deleted $1.
 YYABORT;
 }
 }
 | oper_expr '{' arg_list '}'
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $4);
-OCTAVE_YYUSE ($4);
 $$ = parser.make_index_expression ($1, $3, '{');
 if (! $$)
 {
 // make_index_expression deleted $1 and $3.
 { $$ = 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 ')'
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $5);
-OCTAVE_YYUSE ($5);
 $$ = parser.make_indirect_ref ($1, $4);
 }
 | PLUS_PLUS oper_expr %prec UNARY
 { $$ = parser.make_prefix_op (PLUS_PLUS, $2, $1); }
 { $$ = parser.make_postfix_op (PLUS_PLUS, $1, $2); }
 | power_expr MINUS_MINUS
 { $$ = parser.make_postfix_op (MINUS_MINUS, $1, $2); }
 | power_expr '(' ')'
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $3);
-OCTAVE_YYUSE ($3);
 $$ = parser.make_index_expression ($1, nullptr, '(');
 if (! $$)
 {
 // make_index_expression deleted $1.
 YYABORT;
 }
 }
 | power_expr '(' arg_list ')'
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $4);
-OCTAVE_YYUSE ($4);
 $$ = parser.make_index_expression ($1, $3, '(');
 if (! $$)
 {
 // make_index_expression deleted $1 and $3.
 YYABORT;
 }
 }
 | power_expr '{' '}'
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $3);
-OCTAVE_YYUSE ($3);
 $$ = parser.make_index_expression ($1, nullptr, '{');
 if (! $$)
 {
 // make_index_expression deleted $1.
 YYABORT;
 }
 }
 | power_expr '{' arg_list '}'
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $4);
-OCTAVE_YYUSE ($4);
 $$ = parser.make_index_expression ($1, $3, '{');
 if (! $$)
 {
 // make_index_expression deleted $1 and $3.
 }
 | power_expr indirect_ref_op STRUCT_ELT
 { $$ = parser.make_indirect_ref ($1, $3->text ()); }
 | power_expr indirect_ref_op '(' expression ')'
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $5);
-OCTAVE_YYUSE ($5);
 $$ = parser.make_indirect_ref ($1, $4);
 }
 | PLUS_PLUS power_expr %prec POW
 { $$ = parser.make_prefix_op (PLUS_PLUS, $2, $1); }
 YYABORT;
 }
 }
 | oper_expr ':' oper_expr ':' oper_expr
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $4);
-OCTAVE_YYUSE ($4);
 $$ = parser.make_colon_expression ($1, $5, $3);
 if (! $$)
 {
 { $$ = parser.append_if_clause ($1, $2); }
 ;
 elseif_clause   : ELSEIF stash_comment opt_sep expression stmt_begin opt_sep opt_list
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $6);
-OCTAVE_YYUSE ($6);
 $4->mark_braindead_shortcircuit ();
 $$ = parser.make_elseif_clause ($1, $4, $7, $2);
 }
 { $$ = parser.append_switch_case ($1, $2); }
 ;
 switch_case     : CASE stash_comment opt_sep expression stmt_begin opt_sep opt_list
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $6);
-OCTAVE_YYUSE ($6);
 $$ = parser.make_switch_case ($1, $4, $7, $2);
 }
 ;
 YYABORT;
 }
 }
 | DO stash_comment opt_sep opt_list UNTIL expression
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $3);
-OCTAVE_YYUSE ($3);
 $$ = parser.make_do_until_command ($5, $4, $6, $2);
 }
 | FOR stash_comment assign_lhs '=' expression stmt_begin opt_sep opt_list END
 {
-OCTAVE_YYUSE ($4);
+OCTAVE_YYUSE ($4, $7);
-OCTAVE_YYUSE ($7);
 if (! ($$ = parser.make_for_command (FOR, $1, $3, $5,
 nullptr, $8, $9, $2)))
 {
 // make_for_command deleted $3, $5, and $8.
 YYABORT;
 }
 }
 | FOR stash_comment '(' assign_lhs '=' expression ')' opt_sep opt_list END
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $5, $7, $8);
-OCTAVE_YYUSE ($5);
-OCTAVE_YYUSE ($7);
-OCTAVE_YYUSE ($8);
 if (! ($$ = parser.make_for_command (FOR, $1, $4, $6,
 nullptr, $9, $10, $2)))
 {
 // make_for_command deleted $4, $6, and $9.
 YYABORT;
 }
 }
 | PARFOR stash_comment assign_lhs '=' expression stmt_begin opt_sep opt_list END
 {
-OCTAVE_YYUSE ($4);
+OCTAVE_YYUSE ($4, $7);
-OCTAVE_YYUSE ($7);
 if (! ($$ = parser.make_for_command (PARFOR, $1, $3, $5,
 nullptr, $8, $9, $2)))
 {
 // make_for_command deleted $3, $5, and $8.
 YYABORT;
 }
 }
 | PARFOR stash_comment '(' assign_lhs '=' expression ',' expression ')' opt_sep opt_list END
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $5, $7, $9, $10);
-OCTAVE_YYUSE ($5);
-OCTAVE_YYUSE ($7);
-OCTAVE_YYUSE ($9);
-OCTAVE_YYUSE ($10);
 if (! ($$ = parser.make_for_command (PARFOR, $1, $4, $6,
 $8, $11, $12, $2)))
 {
 // make_for_command deleted $4, $6, $8, and $11.
 // ==========
 except_command  : UNWIND stash_comment opt_sep opt_list CLEANUP
 stash_comment opt_sep opt_list END
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $5, $7);
-OCTAVE_YYUSE ($5);
-OCTAVE_YYUSE ($7);
 if (! ($$ = parser.make_unwind_command ($1, $4, $8, $9, $2, $6)))
 {
 // make_unwind_command deleted $4 and $8.
 YYABORT;
 }
 }
 | TRY stash_comment opt_sep opt_list CATCH stash_comment
 opt_sep opt_list END
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $5, $7);
-OCTAVE_YYUSE ($5);
-OCTAVE_YYUSE ($7);
 if (! ($$ = parser.make_try_command ($1, $4, $7, $8, $9, $2, $6)))
 {
 // make_try_command deleted $4 and $8.
 YYABORT;
 // List of function return value names
 // ===================================
 return_list     : '[' ']'
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $2);
-OCTAVE_YYUSE ($2);
 lexer.m_looking_at_return_list = false;
 $$ = parser.make_parameter_list (octave::tree_parameter_list::out);
 }
 YYABORT;
 }
 }
 | '[' return_list1 ']'
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $3);
-OCTAVE_YYUSE ($3);
 lexer.m_looking_at_return_list = false;
 // Check for duplicate parameter names, varargin,
 // or varargout.
 $$ = nullptr;
 }
 | begin_file opt_nl classdef parsing_local_fcns opt_sep opt_fcn_list END_OF_INPUT
 {
-OCTAVE_YYUSE ($2);
+OCTAVE_YYUSE ($2, $5, $7);
-OCTAVE_YYUSE ($5);
-OCTAVE_YYUSE ($7);
 // Unused symbol table context.
 lexer.m_symtab_context.pop ();
 if (! parser.finish_classdef_file ($3, $6))
 lexer.m_arguments_is_keyword = true;
 }
 | GET '.' identifier
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $2);
-OCTAVE_YYUSE ($2);
 $$ = $3;
 lexer.m_parsed_function_name.top () = true;
 lexer.m_maybe_classdef_get_set_method = false;
 lexer.m_parsing_classdef_get_method = true;
 lexer.m_arguments_is_keyword = true;
 }
 | SET '.' identifier
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $2);
-OCTAVE_YYUSE ($2);
 $$ = $3;
 lexer.m_parsed_function_name.top () = true;
 lexer.m_maybe_classdef_get_set_method = false;
 $$ = parser.make_function ($1, nullptr, $3, $4, $6, $7, $2);
 }
 | function_beg stash_comment return_list '=' fcn_name
 opt_param_list opt_sep function_body function_end
 {
-OCTAVE_YYUSE ($4);
+OCTAVE_YYUSE ($4, $7);
-OCTAVE_YYUSE ($7);
 $$ = parser.make_function ($1, $3, $5, $6, $8, $9, $2);
 }
 ;
 ;
 arguments_block : arguments_beg stash_comment opt_sep args_attr_list
 args_validation_list opt_sep END
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $6);
-OCTAVE_YYUSE ($6);
 octave::comment_list *lc = $2;
 octave::comment_list *tc = lexer.get_comment ();
 if (! ($$ = parser.make_arguments_block ($1, $4, $5, $7, lc, tc)))
 args_attr_list  : // empty
 { $$ = nullptr; }
 | '(' identifier ')'
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $3);
-OCTAVE_YYUSE ($3);
 // Error if $$ is nullptr.
 if  (! ($$ = parser.make_args_attribute_list ($2)))
 {
 // make_args_attribute_list deleted $2.
 size_spec       : // empty
 { $$ = nullptr; }
 | '(' arg_list ')'
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $3);
-OCTAVE_YYUSE ($3);
 if (! ($$ = parser.make_arg_size_spec ($2)))
 {
 // make_arg_size_spec deleted $2.
 YYABORT;
 // Use argument list so we can accept anonymous functions.
 validation_fcns : // empty
 { $$ = nullptr; }
 | '{' arg_list '}'
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $3);
-OCTAVE_YYUSE ($3);
 if (! ($$ = parser.make_arg_validation_fcns ($2)))
 {
 // make_arg_validation_fcns deleted $2.
 YYABORT;
 attr_list       : // empty
 { $$ = nullptr; }
 | '(' attr_list1 ')' opt_sep
 {
-OCTAVE_YYUSE ($1);
+OCTAVE_YYUSE ($1, $3, $4);
-OCTAVE_YYUSE ($3);
-OCTAVE_YYUSE ($4);
 $$ = $2;
 }
 ;
 }
 ;
 class_enum      : stash_comment identifier '(' expression ')'
 {
-OCTAVE_YYUSE ($3);
+OCTAVE_YYUSE ($3, $5);
-OCTAVE_YYUSE ($5);
 $$ = parser.make_classdef_enum ($2, $4, $1);
 }
 ;

Mercurial > octave

comparison libinterp/parse-tree/oct-parse.yy @ 30145:cd6f7957c889