Mercurial > octave

changeset 33102:445396d7edbb 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 John W. Eaton <jwe@octave.org>
date Tue, 27 Feb 2024 23:52:30 -0500
parents 110595642c14 (current diff) 0cee23f74ae9 (diff)
children b0640dacc4ef
files
diffstat 2 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll	Tue Feb 27 16:45:04 2024 -0500
+++ b/libinterp/parse-tree/lex.ll	Tue Feb 27 23:52:30 2024 -0500
@@ -2491,12 +2491,14 @@
 
     if (m_block_comment_nesting_level != 0)
       {
-        warning ("block comment unterminated at end of input");
 
         if ((m_reading_fcn_file || m_reading_script_file || m_reading_classdef_file)
             && ! m_fcn_file_name.empty ())
-          warning ("near line %d of file '%s.m'",
-                   m_filepos.line (), m_fcn_file_name.c_str ());
+          error ("block comment unterminated at end of input\n"
+                 "near line %d of file '%s.m'",
+                 m_filepos.line () - 1, m_fcn_file_name.c_str ());
+        else
+          error ("block comment unterminated at end of input");
       }
 
     token *tok_val = new token (END_OF_INPUT, m_tok_beg, m_tok_end);
--- a/scripts/testfun/__run_test_suite__.m	Tue Feb 27 16:45:04 2024 -0500
+++ b/scripts/testfun/__run_test_suite__.m	Tue Feb 27 23:52:30 2024 -0500
@@ -68,6 +68,8 @@
       if (fid < 0)
         error ("__run_test_suite__: could not open %s for writing", logfile);
       endif
+      tot_cpu_tm = cputime ();
+      tot_tic_tag = tic ();
       test ("", "explain", fid);
       puts ("\nIntegrated test scripts:\n\n");
       printf ("%101s\n", "[ CPU    /  CLOCK ]");
@@ -92,6 +94,9 @@
         drtsk += rtsk;
         drgrs += rgrs;
       endfor
+      tot_clock_tm = toc (tot_tic_tag);
+      tot_cpu_tm = cputime () - tot_cpu_tm;
+      printf ("%80s  [%6.1fs / %6.1fs]", "total time (CPU / CLOCK)", tot_cpu_tm, tot_clock_tm);
       if (! isempty (summary_failure_info))
         puts ("\nFailure Summary:\n\n");
         for i = 1:numel (summary_failure_info)
@@ -215,9 +220,9 @@
             tmp = reduce_test_file_name (ffnm, topbuilddir, topsrcdir);
             print_test_file_name (tmp);
             cpu_tm = cputime ();
-            tic ();
+            tic_tag = tic ();
             [p, n, xf, xb, sk, rtsk, rgrs] = test (ffnm, "quiet", fid);
-            clock_tm = toc ();
+            clock_tm = toc (tic_tag);
             cpu_tm = cputime () - cpu_tm;
             print_pass_fail (p, n, xf, xb, sk, rtsk, rgrs, cpu_tm, clock_tm);
             dp += p;