Mercurial > octave

changeset 22717:f0b4e3903f7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to default.
author Rik <rik@octave.org>
date Thu, 03 Nov 2016 10:06:40 -0700
parents 074765d5c83b (current diff) c2f0e687471e (diff)
children 5654429b6d7e
files
diffstat 5 files changed, 11 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/container.txi	Mon Sep 12 18:52:29 2016 +0200
+++ b/doc/interpreter/container.txi	Thu Nov 03 10:06:40 2016 -0700
@@ -736,14 +736,14 @@
 @example
 @group
 c(:, [1, 3]) = @{0@}
-     @result{}  =
+     @result{} =
         @{
           [1,1] = 0
           [2,1] = 0
           [3,1] = 0
           [1,2] = 2
-          [2,2] =  10
-          [3,2] =  20
+          [2,2] = y
+          [3,2] = 5
           [1,3] = 0
           [2,3] = 0
           [3,3] = 0
--- a/examples/code/embedded.cc	Mon Sep 12 18:52:29 2016 +0200
+++ b/examples/code/embedded.cc	Thu Nov 03 10:06:40 2016 -0700
@@ -2,7 +2,7 @@
 #include <octave/oct.h>
 #include <octave/octave.h>
 #include <octave/parse.h>
-#include <octave/toplev.h>
+#include <octave/interpreter.h>
 
 int
 main (void)
--- a/libinterp/corefcn/cellfun.cc	Mon Sep 12 18:52:29 2016 +0200
+++ b/libinterp/corefcn/cellfun.cc	Thu Nov 03 10:06:40 2016 -0700
@@ -2362,10 +2362,14 @@
 @group
 Y = cell (size (X));
 for i = 1:numel (X)
-  Y@{i@} = X@{i@}(varargin@{:@});
+  Y@{i@} = X@{i@}(varargin@{1@}, varargin@{2@}, @dots{}, varargin@{N@});
 endfor
 @end group
 @end example
+
+The indexing arguments may be scalar (@code{2}), arrays (@code{[1, 3]}),
+ranges (@code{1:3}), or the colon operator (@qcode{":"}).  However, the
+indexing keyword @code{end} is not available.
 @seealso{cellslices, cellfun}
 @end deftypefn */)
 {
--- a/libinterp/corefcn/syscalls.cc	Mon Sep 12 18:52:29 2016 +0200
+++ b/libinterp/corefcn/syscalls.cc	Thu Nov 03 10:06:40 2016 -0700
@@ -206,7 +206,7 @@
 Start a subprocess with two-way communication.
 
 The name of the process is given by @var{command}, and @var{args} is an
-array of strings containing options for the command.
+array or cell array of strings containing options for the command.
 
 The file identifiers for the input and output streams of the subprocess are
 returned in @var{in} and @var{out}.  If execution of the command is
--- a/libinterp/parse-tree/oct-parse.in.yy	Mon Sep 12 18:52:29 2016 +0200
+++ b/libinterp/parse-tree/oct-parse.in.yy	Thu Nov 03 10:06:40 2016 -0700
@@ -4786,16 +4786,7 @@
   if (fcn.is_defined ())
     retval = fcn.do_multi_index_op (nargout, args);
   else
-    {
-      try
-        {
-          maybe_missing_function_hook (name);
-        }
-      catch (octave::execution_exception& e)
-        {
-          error (e, "feval: function '%s' not found", name.c_str ());
-        }
-    }
+    error ("feval: function '%s' not found", name.c_str ());
 
   return retval;
 }