view libinterp/octave-value/ov-builtin.cc @ 23502:c6714ae1c06c

eliminate remaining do_multi_index_op methods For function (and function-like) objects, define a call meethod instead of do_multi_index_op. For data value objects, remove do_multi_index_op as it is no longer used for indexing operations. * ov-fcn.h (octave_function::call): New pure virtual function. * ov-builtin.cc, ov-builtin.h (octave_builtin::call): Rename from do_multi_index_op. Change all uses. * ov-mex-fcn.cc, ov-mex-fcn.h (octave_mex_function::call): Rename from do_multi_index_op. Change all uses. * ov-usr-fcn.cc, ov-usr-fcn.h (octave_user_script::call): Rename from do_multi_index_op. Change all uses. (octave_user_fcn::call): Likewise. * ov-classdef.cc (octave_classdef_meta::call): Rename from do_multi_index_op. Change all uses. (octave_classdef_superclass_ref::call): Likewise. * ov-fcn-handle.cc, ov-fcn-handle.h (octave_fcn_handle::call): Rename from do_multi_index_op. Now a protected virtual function. (octave_fcn_binder::call): Rename from do_multi_index_op. Now a protected function. * ov-class.h (octave_class::do_multi_index_op): Delete. * ov-base-mat.h (octave_base_matrix::do_multi_index_op): Delete. * ov-base-scalar.h (octave_base_scalar::do_multi_index_op): Delete. * ov-base.cc, ov-base.h (octave_base_value::do_multi_index_op): Delete. * ov.cc, ov.h (octave_value::do_multi_index_op): Delete. * oct-parse.in.yy (source_file): Use call instead of do_multi_index_op. (feval (const std::string&, const octave_value_list&, int)): Likewise. (feval (octave_function *, const octave_value_list&, int)): Likewise. (feval (octave_value&, const octave_value_list&, int)): Instead of do_multi_index_op, use call for function objects and subsref for function_handle objects. Also handle named functions. (feval (const octave_value_list&, int)): Simply extract first argument and forward to feval (octave_value&, const octave_value_list&, int). * pt-eval.cc (tree_evaluator::visit_identifier, tree_evaluator::visit_index_expression, tree_evaluator::visit_funcall): Use call instead of do_multi_index_op.
author John W. Eaton <jwe@octave.org>
date Wed, 17 May 2017 14:34:05 -0400
parents 73558a835b64
children 8744d4ed8fb4
line wrap: on
line source

/*

Copyright (C) 1996-2017 John W. Eaton

This file is part of Octave.

Octave is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

Octave is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with Octave; see the file COPYING.  If not, see
<http://www.gnu.org/licenses/>.

*/

#if defined (HAVE_CONFIG_H)
#  include "config.h"
#endif

#include "call-stack.h"
#include "error.h"
#include "errwarn.h"
#include "ovl.h"
#include "ov-builtin.h"
#include "ov.h"
#include "profiler.h"
#include "interpreter.h"
#include "unwind-prot.h"


DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_builtin,
                                     "built-in function",
                                     "built-in function");

octave_value_list
octave_builtin::subsref (const std::string& type,
                         const std::list<octave_value_list>& idx,
                         int nargout)
{
  octave_value_list retval;

  switch (type[0])
    {
    case '(':
      {
        int tmp_nargout = (type.length () > 1 && nargout == 0) ? 1 : nargout;

        retval = call (tmp_nargout, idx.front ());
      }
      break;

    case '{':
    case '.':
      {
        std::string nm = type_name ();
        error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
      }
      break;

    default:
      panic_impossible ();
    }

  // FIXME: perhaps there should be an
  // octave_value_list::next_subsref member function?  See also
  // octave_user_function::subsref.
  //
  // FIXME: Note that if a function call returns multiple
  // values, and there is further indexing to perform, then we are
  // ignoring all but the first value.  Is this really what we want to
  // do?  If it is not, then what should happen for stat("file").size,
  // for exmaple?

  if (idx.size () > 1)
    retval = retval(0).next_subsref (nargout, type, idx);

  return retval;
}

octave_value_list
octave_builtin::call (int nargout, const octave_value_list& args)
{
  octave_value_list retval;

  if (args.has_magic_colon ())
    error ("invalid use of colon in function argument list");

  octave::unwind_protect frame;

  octave::call_stack::push (this);

  frame.add_fcn (octave::call_stack::pop);

  profile_data_accumulator::enter<octave_builtin> block (profiler, *this);

  retval = (*f) (args, nargout);

  // Do not allow null values to be returned from functions.
  // FIXME: perhaps true builtins should be allowed?

  retval.make_storable_values ();

  // Fix the case of a single undefined value.
  // This happens when a compiled function uses
  //
  //   octave_value retval;
  //
  // instead of
  //
  //   octave_value_list retval;
  //
  // the idiom is very common, so we solve that here.

  if (retval.length () == 1 && retval.xelem (0).is_undefined ())
    retval.clear ();

  return retval;
}

jit_type *
octave_builtin::to_jit (void) const
{
  return jtype;
}

void
octave_builtin::stash_jit (jit_type& type)
{
  jtype = &type;
}

octave_builtin::fcn
octave_builtin::function (void) const
{
  return f;
}

void
octave_builtin::push_dispatch_class (const std::string& dispatch_type)
{
  dispatch_classes.insert (dispatch_type);
}

bool
octave_builtin::handles_dispatch_class (const std::string& dispatch_type) const
{
  return dispatch_classes.find (dispatch_type) != dispatch_classes.end ();
}