math: add kwarg_or helper function

CleverRaven · Oct 21, 2024 · cb3c96c · cb3c96c
1 parent 9fef886
commit cb3c96c
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 152 deletions.
diff --git a/src/math_parser.cpp b/src/math_parser.cpp
@@ -204,7 +204,7 @@ constexpr void _validate_operand( thingie const &thing, std::string_view symbol
 
 void _validate_unused_kwargs( diag_kwargs const &kwargs )
 {
- for( diag_kwargs::value_type const &v : kwargs ) {
+ for( diag_kwargs::impl_t::value_type const &v : kwargs.kwargs ) {
  if( !v.second.was_used() ) {
  throw std::invalid_argument( string_format( R"(Unused kwarg "%s")", v.first ) );
  }
@@ -601,7 +601,7 @@ void math_exp::math_exp_impl::new_func()
  "All positional arguments must precede keyword-value pairs" );
  }
  kwarg &kw = std::get<kwarg>( output.top().data );
- kwargs.emplace( kw.key, _get_diag_value( *kw.val ) );
+ kwargs.kwargs.emplace( kw.key, _get_diag_value( *kw.val ) );
  output.pop();
  }
  for( std::vector<thingie>::size_type i = 0; i < nparams; i++ ) {