Mercurial > octave

changeset 32999:f2ed83c748cf bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge default to bytecode-interpreter.
author Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
date Fri, 09 Feb 2024 21:47:16 -0500
parents 4be40c3c11ba (current diff) 7ab350607296 (diff)
children 19973af3ac42
files
diffstat 3 files changed, 17 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/genpropdoc.m	Fri Feb 09 17:40:13 2024 +0100
+++ b/doc/interpreter/genpropdoc.m	Fri Feb 09 21:47:16 2024 -0500
@@ -3536,11 +3536,12 @@
   for ii = 1:numel (categories)
     fields = sort (allfields(strcmp (allcategories, categories{ii})));
     nf = numel (fields);
-    str = sprintf ("%s\n\n@subsubheading %s", str, categories{ii});
-    str = sprintf ("%s\n@anchor{XREF%scategory%s}\n@prindex %s %s\n", str, ...
-                   objname, strrep (categories{ii}, " ", ""), ...
+    str = sprintf ("%s\n\n@anchor{XREF%scategory%s}", str, ...
                    objname, strrep (categories{ii}, " ", ""));
-    str = sprintf ("%s\n\n@table @asis", str);
+    str = sprintf ("%s@subsubheading %s\n", str, categories{ii});
+    str = sprintf ("%s@prindex %s %s\n", str, ...
+                   objname, strrep (categories{ii}, " ", ""));
+    str = sprintf ("%s\n@table @asis", str);
 
     for jj = 1:nf
       field = fields{jj};
--- a/doc/interpreter/grammar.txi	Fri Feb 09 17:40:13 2024 +0100
+++ b/doc/interpreter/grammar.txi	Fri Feb 09 21:47:16 2024 -0500
@@ -46,7 +46,7 @@
 @ref{XREFkwcategoryClassdefStructures,,@w{Classdef Structures}}@: |
 @ref{XREFkwcategoryExecutionEnvironment,,@w{Execution Environment}}@:
 
-@subsubheading Alphabetical listing:
+@subsubheading Alphabetical keyword listing:
 
 @ref{XREF__FILE__,,__FILE__}@: |
 @ref{XREF__LINE__,,__LINE__}@: |
@@ -91,22 +91,19 @@
 @ref{XREFunwind_protect_cleanup,,unwind_protect_cleanup}@: |
 @ref{XREFwhile,,while}@:
 
-@subheading Utility Functions:
-@anchor{XREFkwcategoryUtilityFunctions}
+@anchor{XREFkwcategoryUtilityFunctions}@subheading Utility Functions:
 The function @code{iskeyword} can be used to quickly check whether an
 identifier is reserved by Octave.
 
 @DOCSTRING(iskeyword)
 
-@subheading Variable Declaration:
-@anchor{XREFkwcategoryVariableDeclaration}
+@anchor{XREFkwcategoryVariableDeclaration}@subheading Variable Declaration:
 
 @DOCSTRING(global)
 
 @DOCSTRING(persistent)
 
-@subheading Function Definition:
-@anchor{XREFkwcategoryFunctionDefinition}
+@anchor{XREFkwcategoryFunctionDefinition}@subheading Function Definition:
 
 @DOCSTRING(function)
 
@@ -116,8 +113,7 @@
 
 @DOCSTRING(return)
 
-@subheading Control Statements:
-@anchor{XREFkwcategoryControlStructures}
+@anchor{XREFkwcategoryControlStructures}@subheading Control Statements:
 
 @DOCSTRING(if)
 
@@ -147,8 +143,7 @@
 
 @DOCSTRING(end_unwind_protect)
 
-@subheading Iterating Structures:
-@anchor{XREFkwcategoryIteratingStructures}
+@anchor{XREFkwcategoryIteratingStructures}@subheading Iterating Structures:
 
 @DOCSTRING(for)
 
@@ -170,8 +165,7 @@
 
 @DOCSTRING(continue)
 
-@subheading Classdef Structures:
-@anchor{XREFkwcategoryClassdefStructures}
+@anchor{XREFkwcategoryClassdefStructures}@subheading Classdef Structures:
 
 @DOCSTRING(classdef)
 
@@ -182,7 +176,7 @@
 @anchor{XREFkwpropertyproperties}
 @deftypefn {} {} properties
 Mark the beginning of a block of properties in a classdef definition.  Note
-that @ref{XREFproperties, , the function @qcode{"properties"}} is a function
+that the @ref{XREFproperties, , function @qcode{"properties"}} is a function
 that lists the properties of a classdef class or object.
 @seealso{@ref{XREFendproperties, , endproperties}}
 @end deftypefn
@@ -194,7 +188,7 @@
 @anchor{XREFkwpropertymethods}
 @deftypefn {} {} methods
 Mark the beginning of a block of methods in a classdef definition.  Note that
-@ref{XREFmethods, , the function @qcode{"methods"}} is a function that lists
+the @ref{XREFmethods, , function @qcode{"methods"}} is a function that lists
 the methods of a class or object.
 @seealso{@ref{XREFendmethods, , endmethods}}
 @end deftypefn
@@ -209,8 +203,7 @@
 
 @DOCSTRING(endenumeration)
 
-@subheading Execution Environment:
-@anchor{XREFkwcategoryExecutionEnvironment}
+@anchor{XREFkwcategoryExecutionEnvironment}@subheading Execution Environment:
 
 @DOCSTRING(__FILE__)
 
--- a/libinterp/corefcn/filter.cc	Fri Feb 09 17:40:13 2024 +0100
+++ b/libinterp/corefcn/filter.cc	Fri Feb 09 21:47:16 2024 -0500
@@ -601,8 +601,8 @@
 %! assert (filter (b, [1], x   ), r*[1 1 0 0 0 0 0 0 0 0]   );
 %! assert (filter (b, [1], r*x ), r*r*[1 1 0 0 0 0 0 0 0 0] );
 %! assert (filter (b, [1], x.' ), r*[1 1 0 0 0 0 0 0 0 0].' );
-%! assert (filter (b, a,   x   ),   [1 0 0 0 0 0 0 0 0 0]   );
-%! assert (filter (b, a,   r*x ), r*[1 0 0 0 0 0 0 0 0 0]   );
+%! assert (filter (b, a,   x   ),   [1 0 0 0 0 0 0 0 0 0], eps);
+%! assert (filter (b, a,   r*x ), r*[1 0 0 0 0 0 0 0 0 0], eps);
 
 %!shared a, b, x, y, so
 %!test