Mercurial > octave
diff src/ov-fcn-inline.cc @ 11070:686d5bd22132
ov-fcn-inline.cc: use octve_scalar_map instead of Octave_map
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 01 Oct 2010 04:36:31 -0400 |
parents | 89f4d7e294cc |
children | fd0a3ac60b0e |
line wrap: on
line diff
--- a/src/ov-fcn-inline.cc Fri Oct 01 04:30:47 2010 -0400 +++ b/src/ov-fcn-inline.cc Fri Oct 01 04:36:31 2010 -0400 @@ -120,17 +120,23 @@ octave_map octave_fcn_inline::map_value (void) const { - Octave_map m; + octave_scalar_map m; + + m.assign ("version", 1.0); + m.assign ("isEmpty", 0.0); + m.assign ("expr", fcn_text ()); + string_vector args = fcn_arg_names (); - m.assign ("version", octave_value (1.0)); - m.assign ("isEmpty", octave_value (0.0)); - m.assign ("expr", octave_value (fcn_text ())); - m.assign ("numArgs", octave_value (args.length ())); - m.assign ("args", octave_value (args)); + + m.assign ("numArgs", args.length ()); + m.assign ("args", args); + std::ostringstream buf; + for (int i = 0; i < args.length (); i++) buf << args(i) << " = INLINE_INPUTS_{" << i + 1 << "}; "; - m.assign ("inputExpr", octave_value (buf.str ())); + + m.assign ("inputExpr", buf.str ()); return m; }