Mercurial > octave
changeset 33266:1a8c76030b24 bytecode-interpreter
maint: Merge default to bytecode-interpreter
| author | Arun Giridhar <arungiridhar@gmail.com> |
|---|---|
| date | Thu, 28 Mar 2024 14:51:11 -0400 |
| parents | c338b0cb940e (current diff) 421c45e180ce (diff) |
| children | 660eb2766b9e |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.cc Thu Mar 28 00:33:50 2024 -0400 +++ b/libgui/qterminal/libqterminal/QTerminal.cc Thu Mar 28 14:51:11 2024 -0400 @@ -107,7 +107,7 @@ if (has_selected_text) { - QRegularExpression expr {".*\b*(\\w+)\b*.*"}; + QRegularExpression expr {"(\\w+)"}; QRegularExpressionMatch match = expr.match (selected_text); if (match.hasMatch ())
--- a/liboctave/array/Array.h Thu Mar 28 00:33:50 2024 -0400 +++ b/liboctave/array/Array.h Thu Mar 28 14:51:11 2024 -0400 @@ -131,7 +131,7 @@ protected: //! The real representation of all arrays. - class ArrayRep : public Alloc + class OCTARRAY_TEMPLATE_API ArrayRep : public Alloc { public: @@ -144,6 +144,7 @@ octave_idx_type m_len; octave::refcount<octave_idx_type> m_count; + OCTARRAY_OVERRIDABLE_FUNC_API ArrayRep (pointer d, octave_idx_type len) : Alloc (), m_data (allocate (len)), m_len (len), m_count (1) { @@ -187,13 +188,16 @@ ~ArrayRep () { deallocate (m_data, m_len); } - octave_idx_type numel () const { return m_len; } + OCTARRAY_OVERRIDABLE_FUNC_API octave_idx_type numel () const + { + return m_len; + } // No assignment! ArrayRep& operator = (const ArrayRep&) = delete; - pointer allocate (size_t len) + OCTARRAY_OVERRIDABLE_FUNC_API pointer allocate (size_t len) { pointer data = Alloc_traits::allocate (*this, len); for (size_t i = 0; i < len; i++) @@ -201,7 +205,7 @@ return data; } - void deallocate (pointer data, size_t len) + OCTARRAY_OVERRIDABLE_FUNC_API void deallocate (pointer data, size_t len) { for (size_t i = 0; i < len; i++) T_Alloc_traits::destroy (*this, data+i);