Mercurial > octave
changeset 32979:5518a27d2a48
maint: merge stable to default
author | Rik <rik@octave.org> |
---|---|
date | Wed, 07 Feb 2024 20:59:00 -0800 |
parents | 3a928ac45a57 (current diff) e1351a7cdc4d (diff) |
children | e31d283a2701 |
files | |
diffstat | 1 files changed, 97 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/grammar.txi Wed Feb 07 23:29:40 2024 -0500 +++ b/doc/interpreter/grammar.txi Wed Feb 07 20:59:00 2024 -0800 @@ -38,60 +38,58 @@ @subsubheading Categories: -@ref{XREFkwcategoryUtilityFunctions, , @w{Utility Functions}} | -@ref{XREFkwcategoryVariableDeclaration, , @w{Variable Declaration}} | -@ref{XREFkwcategoryFunctionDefinition, , @w{Function Definition}} | -@ref{XREFkwcategoryControlStructures, , @w{Control Statements}} | -@ref{XREFkwcategoryIteratingStructures, , @w{Iterating Structures}} | -@ref{XREFkwcategoryClassdefStructures, , @w{Classdef Structures}} | -@ref{XREFkwcategoryExecutionEnvironment, , @w{Execution Environment}} - +@ref{XREFkwcategoryUtilityFunctions,,@w{Utility Functions}} | +@ref{XREFkwcategoryVariableDeclaration,,@w{Variable Declaration}} | +@ref{XREFkwcategoryFunctionDefinition,,@w{Function Definition}} | +@ref{XREFkwcategoryControlStructures,,@w{Control Statements}} | +@ref{XREFkwcategoryIteratingStructures,,@w{Iterating Structures}} | +@ref{XREFkwcategoryClassdefStructures,,@w{Classdef Structures}} | +@ref{XREFkwcategoryExecutionEnvironment,,@w{Execution Environment}} @subsubheading Alphabetical listing: -@ref{XREF__FILE__, __FILE__} | -@ref{XREF__LINE__, __LINE__} | -@ref{XREFbreak, , break} | -@ref{XREFcase, , case} | -@ref{XREFcatch, , catch} | -@ref{XREFclassdef, , classdef} | -@ref{XREFcontinue, , continue} | -@ref{XREFdo, , do} | -@ref{XREFelse, , else} | -@ref{XREFelseif, , elseif} | -@ref{XREFend, , end} | -@ref{XREFend_try_catch, , end_try_catch} | -@ref{XREFend_unwind_protect, , end_unwind_protect} | -@ref{XREFendclassdef, , endclassdef} | -@ref{XREFendenumeration, , endenumeration} | -@ref{XREFendevents, , endevents} | -@ref{XREFendfor, , endfor} | -@ref{XREFendfunction, , endfunction} | -@ref{XREFendif, , endif} | -@ref{XREFendmethods, , endmethods} | -@ref{XREFendparfor, , endparfor} | -@ref{XREFendproperties, , endproperties} | -@ref{XREFendswitch, , endswitch} | -@ref{XREFendwhile, , endwhile} | -@ref{XREFenumeration, , endenumeration} | -@ref{XREFevents, , events} | -@ref{XREFfor, , for} | -@ref{XREFfunction, , function} | -@ref{XREFglobal, , global} | -@ref{XREFif, , if} | -@ref{XREFkwpropertymethods, , methods} | -@ref{XREFotherwise, , otherwise} | -@ref{XREFparfor, , parfor} | -@ref{XREFpersistent, , persistent} | -@ref{XREFkwpropertyproperties, , properties} | -@ref{XREFreturn, , return} | -@ref{XREFswitch, , switch} | -@ref{XREFtry, , try} | -@ref{XREFuntil, , until} | -@ref{XREFunwind_protect, , unwind_protect} | -@ref{XREFunwind_protect_cleanup, , unwind_protect_cleanup} | -@ref{XREFwhile, , while} - +@ref{XREF__FILE__,,__FILE__} | +@ref{XREF__LINE__,,__LINE__} | +@ref{XREFbreak,,break} | +@ref{XREFcase,,case} | +@ref{XREFcatch,,catch} | +@ref{XREFclassdef,,classdef} | +@ref{XREFcontinue,,continue} | +@ref{XREFdo,,do} | +@ref{XREFelse,,else} | +@ref{XREFelseif,,elseif} | +@ref{XREFend,,end} | +@ref{XREFend_try_catch,,end_try_catch} | +@ref{XREFend_unwind_protect,,end_unwind_protect} | +@ref{XREFendclassdef,,endclassdef} | +@ref{XREFendenumeration,,endenumeration} | +@ref{XREFendevents,,endevents} | +@ref{XREFendfor,,endfor} | +@ref{XREFendfunction,,endfunction} | +@ref{XREFendif,,endif} | +@ref{XREFendmethods,,endmethods} | +@ref{XREFendparfor,,endparfor} | +@ref{XREFendproperties,,endproperties} | +@ref{XREFendswitch,,endswitch} | +@ref{XREFendwhile,,endwhile} | +@ref{XREFenumeration,,endenumeration} | +@ref{XREFevents,,events} | +@ref{XREFfor,,for} | +@ref{XREFfunction,,function} | +@ref{XREFglobal,,global} | +@ref{XREFif,,if} | +@ref{XREFkwpropertymethods,,methods} | +@ref{XREFotherwise,,otherwise} | +@ref{XREFparfor,,parfor} | +@ref{XREFpersistent,,persistent} | +@ref{XREFkwpropertyproperties,,properties} | +@ref{XREFreturn,,return} | +@ref{XREFswitch,,switch} | +@ref{XREFtry,,try} | +@ref{XREFuntil,,until} | +@ref{XREFunwind_protect,,unwind_protect} | +@ref{XREFunwind_protect_cleanup,,unwind_protect_cleanup} | +@ref{XREFwhile,,while} @subheading Utility Functions: @anchor{XREFkwcategoryUtilityFunctions} @@ -100,87 +98,124 @@ @DOCSTRING(iskeyword) - @subheading Variable Declaration: @anchor{XREFkwcategoryVariableDeclaration} + @DOCSTRING(global) + @DOCSTRING(persistent) - @subheading Function Definition: @anchor{XREFkwcategoryFunctionDefinition} + @DOCSTRING(function) + @DOCSTRING(endfunction) + @DOCSTRING(end) + @DOCSTRING(return) - @subheading Control Statements: @anchor{XREFkwcategoryControlStructures} + @DOCSTRING(if) + @DOCSTRING(else) + @DOCSTRING(elseif) + @DOCSTRING(endif) + @DOCSTRING(switch) + @DOCSTRING(case) + @DOCSTRING(otherwise) + @DOCSTRING(endswitch) + @DOCSTRING(try) + @DOCSTRING(catch) + @DOCSTRING(end_try_catch) + @DOCSTRING(unwind_protect) + @DOCSTRING(unwind_protect_cleanup) + @DOCSTRING(end_unwind_protect) - @subheading Iterating Structures: @anchor{XREFkwcategoryIteratingStructures} + @DOCSTRING(for) + @DOCSTRING(endfor) + @DOCSTRING(while) + @DOCSTRING(endwhile) + @DOCSTRING(do) + @DOCSTRING(until) + @DOCSTRING(parfor) + @DOCSTRING(endparfor) + @DOCSTRING(break) + @DOCSTRING(continue) - @subheading Classdef Structures: @anchor{XREFkwcategoryClassdefStructures} + @DOCSTRING(classdef) + @DOCSTRING(endclassdef) + @c methods definition must be manually created to avoid -@c collision with function of same name -@deftypefn {} {} properties @anchor{XREFkwpropertyproperties} +@c collision with function of the same name. +@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 lists the properties of a classdef class or object. @seealso{@ref{XREFendproperties, , endproperties}} @end deftypefn + @DOCSTRING(endproperties) + @c methods definition must be manually created to avoid -@c collision with function of same name -@deftypefn {} {} methods @anchor{XREFkwpropertymethods} +@c collision with function of the same name. +@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 methods of a class or object. @seealso{@ref{XREFendmethods, , endmethods}} @end deftypefn + @DOCSTRING(endmethods) + @DOCSTRING(events) + @DOCSTRING(endevents) + @DOCSTRING(enumeration) + @DOCSTRING(endenumeration) - @subheading Execution Environment: @anchor{XREFkwcategoryExecutionEnvironment} + @DOCSTRING(__FILE__) + @DOCSTRING(__LINE__) - @node Parser @section Parser @cindex parser