@@ -431,14 +431,15 @@ namespace exec {
431431 using __frame_t = typename _Clock::time_point;
432432 using __duration_t = typename _Clock::duration;
433433
434- constexpr auto __make_span = []<std::size_t _LenB>(__mstring<_LenB>&& __string) noexcept {
435- return std::span<char >{__string.__what_ , _LenB - 1 };
436- };
434+ constexpr auto __make_span =
435+ []<std::size_t _LenB>(const __mstring<_LenB>& __string) noexcept {
436+ return std::span<const char >{__string.__what_ , _LenB - 1 };
437+ };
437438
438439 std::vector<marble_t <_Clock>> __marbles;
439440 __frame_t __group_start_frame{-1ms};
440441 __frame_t __frame = __clock.now ();
441- auto __whole = __make_span (std::move ( __diagram) );
442+ auto __whole = __make_span (__diagram);
442443 auto __remaining = __whole;
443444 auto __consume_first = [&__remaining](std::size_t __skip) noexcept {
444445 __remaining = __remaining.subspan (__skip);
@@ -531,15 +532,18 @@ namespace exec {
531532 && __all_digits) {
532533 auto __to_consume = __suffix_begin - __remaining.begin ();
533534 long __duration = std::atol (__remaining.data ());
534- if (std::ranges::equal (
535- __remaining.subspan (__to_consume, 3 ), __make_span (" ms " _mstr))) {
535+ const auto __ms_str = " ms " _mstr;
536+ const auto __ms = __make_span (__ms_str);
537+ const auto __s_str = " s " _mstr;
538+ const auto __s = __make_span (__s_str);
539+ const auto __m_str = " m " _mstr;
540+ const auto __m = __make_span (__m_str);
541+ if (std::ranges::equal (__remaining.subspan (__to_consume, 3 ), __ms)) {
536542 __to_consume += 2 ;
537- } else if (std::ranges::equal (
538- __remaining.subspan (__to_consume, 2 ), __make_span (" s " _mstr))) {
543+ } else if (std::ranges::equal (__remaining.subspan (__to_consume, 2 ), __s)) {
539544 __duration *= 1000 ;
540545 __to_consume += 1 ;
541- } else if (std::ranges::equal (
542- __remaining.subspan (__to_consume, 2 ), __make_span (" m " _mstr))) {
546+ } else if (std::ranges::equal (__remaining.subspan (__to_consume, 2 ), __m)) {
543547 __duration = __duration * 1000 * 60 ;
544548 __to_consume += 1 ;
545549 } else {
0 commit comments