From 6144b88db223f5587979e1c8847056f2b4a025ff Mon Sep 17 00:00:00 2001
From: NeilBrown <neil@brown.name>
Date: Sat, 18 Dec 2021 21:24:32 +1100
Subject: [PATCH] oceani: mark some more UNTESTED code

When I first wrote this script I had some issues that cause false
positives and I filtered too many of them.

Signed-off-by: NeilBrown <neil@brown.name>
---
 csrc/oceani.mdc     | 24 ++++++++++++++++--------
 tools/mark-untested |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index e16d56f..f5e2b6e 100644
--- a/csrc/oceani.mdc
+++ b/csrc/oceani.mdc
@@ -2963,10 +2963,12 @@ function will be needed.
 	} }$
 
 	$*fieldlist
-	FieldBlock -> { IN OptNL FieldLines OUT OptNL } ${ $0 = $<FL; }$
+	FieldBlock -> { IN OptNL FieldLines OUT OptNL } ${ $0 = $<FL;	// UNTESTED
+		}$
 	| { SimpleFieldList } ${ $0 = $<SFL; }$
 	| IN OptNL FieldLines OUT ${ $0 = $<FL; }$
-	| SimpleFieldList EOL ${ $0 = $<SFL; }$
+	| SimpleFieldList EOL ${ $0 = $<SFL;	// UNTESTED
+		}$
 
 	FieldLines -> SimpleFieldList Newlines ${ $0 = $<SFL; }$
 	| FieldLines SimpleFieldList Newlines ${ {
@@ -4550,23 +4552,29 @@ the common header for all reductions to use.
 	$TERM { } ;
 
 	$*binode
-	Block -> { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
-	|	 { SimpleStatements } ${ $0 = reorder_bilist($<SS); }$
+	Block -> { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl;	// UNTESTED
+		}$
+	|	 { SimpleStatements } ${ $0 = reorder_bilist($<SS);	// UNTESTED
+		}$
 	|	 SimpleStatements ; ${ $0 = reorder_bilist($<SS); }$
-	|	 SimpleStatements EOL ${ $0 = reorder_bilist($<SS); }$
+	|	 SimpleStatements EOL ${ $0 = reorder_bilist($<SS); 	// UNTESTED
+		}$
 	|	 IN OptNL Statementlist OUT ${ $0 = $<Sl; }$
 
-	OpenBlock -> OpenScope { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
+	OpenBlock -> OpenScope { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl;	// UNTESTED
+		}$
 	|	 OpenScope { SimpleStatements } ${ $0 = reorder_bilist($<SS); }$
 	|	 OpenScope SimpleStatements ; ${ $0 = reorder_bilist($<SS); }$
 	|	 OpenScope SimpleStatements EOL ${ $0 = reorder_bilist($<SS); }$
 	|	 IN OpenScope OptNL Statementlist OUT ${ $0 = $<Sl; }$
 
-	UseBlock -> { OpenScope IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
+	UseBlock -> { OpenScope IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl;	// UNTESTED
+		}$
 	|	 { OpenScope SimpleStatements } ${ $0 = reorder_bilist($<SS); }$
 	|	 IN OpenScope OptNL Statementlist OUT ${ $0 = $<Sl; }$
 
-	ColonBlock -> { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
+	ColonBlock -> { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl;	// UNTESTED
+		}$
 	|	 { SimpleStatements } ${ $0 = reorder_bilist($<SS); }$
 	|	 : SimpleStatements ; ${ $0 = reorder_bilist($<SS); }$
 	|	 : SimpleStatements EOL ${ $0 = reorder_bilist($<SS); }$
diff --git a/tools/mark-untested b/tools/mark-untested
index 83b7b5f..57fe869 100755
--- a/tools/mark-untested
+++ b/tools/mark-untested
@@ -17,7 +17,7 @@ case $1 in
 	 if [ ! -f "$b" ]; then 
 	    continue
 	 fi
-	 grep '#####:' "$i" | grep -vE '(NOTEST|UNTESTED|:	*##|}\$$|:$)' |
+	 grep '#####:' "$i" | grep -vE '(NOTEST|UNTESTED|:	*##|[0-9]:[ 	]*}\$$|:$)' |
 	     awk -F: '{printf "%ds,$,	// UNTESTED,\n", $2}' |
 	     sed -i -e 's,[	 ]*// UNTESTED$,,' -f - "$b"
          grep '[0-8]: *[1-9][0-9]*:.*// NOTEST$' "$i" |
-- 
2.43.0