Mercurial > hg > octave-nkf
view scripts/strings/str2num.m @ 16048:10142aad4b9f classdef
Implement indirect method call: fun(obj, ...).
* libinterp/octave-value/ov-classdef.h (class cdef_manager): New class.
(cdef_method::cdef_method_rep::meta_subsref,
cdef_method::cdef_method_rep::meta_is_postfix_index_handled): New
methods.
* libinterp/octave-value/ov-classdef.cc (all_packages, all_classes):
Move static variables to class cdef_manager.
(lookup_class (std::string, bool, bool)): Move implementation to
method cdef_manager::do_find_class().
(lookup_package): Move implementation to method
cdef_manager::do_find_package().
(make_class): Use cdef_manager::register_class.
(make_package): Use cdef_manager::register_package and
cdef_manager::find_package.
(cdef_class::cdef_class_rep::meta_release): Use
cdef_manager::unregister_class.
(cdef_method::cdef_method_rep::meta_subsref): New method.
(class cdef_manager): New class.
* libinterp/interpfcn/symtab.cc
(symbol_table::fcn_info::fcn_info_rep::load_class_constructor):
Look for classdef constructor in normal m-files. Call
find_user_function() and check whether the result is a classdef
constructor. If it is, stash it as a constructor and restore the
previous value of function_on_path.
(symbol_table::fcn_info::fcn_info_rep::load_class_method): Look for
method in classdef system, using cdef_manager::find_method_symbol().
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Mon, 11 Feb 2013 15:20:00 -0500 |
parents | f3d52523cde1 |
children | bc924baa2c4e |
line wrap: on
line source
## Copyright (C) 1996-2012 Kurt Hornik ## ## 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/>. ## -*- texinfo -*- ## @deftypefn {Function File} {@var{x} =} str2num (@var{s}) ## @deftypefnx {Function File} {[@var{x}, @var{state}] =} str2num (@var{s}) ## Convert the string (or character array) @var{s} to a number (or an ## array). Examples: ## ## @example ## @group ## str2num ("3.141596") ## @result{} 3.141596 ## ## str2num (["1, 2, 3"; "4, 5, 6"]) ## @result{} 1 2 3 ## 4 5 6 ## @end group ## @end example ## ## The optional second output, @var{state}, is logically true when the ## conversion is successful. If the conversion fails the numeric output, ## @var{x}, is empty and @var{state} is false. ## ## @strong{Caution:} As @code{str2num} uses the @code{eval} function ## to do the conversion, @code{str2num} will execute any code contained ## in the string @var{s}. Use @code{str2double} for a safer and faster ## conversion. ## ## For cell array of strings use @code{str2double}. ## @seealso{str2double, eval} ## @end deftypefn ## Author: jwe function [m, state] = str2num (s) if (nargin != 1) print_usage (); elseif (! ischar (s)) error ("str2num: S must be a string or string array"); endif s(:, end+1) = ";"; s = sprintf ("m = [%s];", reshape (s', 1, numel (s))); state = true; eval (s, "m = []; state = false;"); if (ischar (m)) m = []; state = false; endif endfunction %!assert (str2num ("-1.3e2"), -130) %!assert (str2num ("[1, 2; 3, 4]"), [1, 2; 3, 4]) %!test %! [x, state] = str2num ("pi"); %! assert (state); %! [x, state] = str2num ("Hello World"); %! assert (! state); %% Test input validation %!error str2num () %!error str2num ("string", 1) %!error <S must be a string> str2num ({"string"})