Better formatting of pedant output. EV_PEDANT can also set pedant's options.

diff --git a/bin/lib b/bin/lib
index bbe3beb9c1ec62f6765b05a7208b32957961a029..9c49f9e9fac26982925a13ab61c9df97b490f978 100644 (file)
--- a/bin/lib
+++ b/bin/lib
@@ -268,7 +268,15 @@ function test-prolog
        esac
        if [ -n "$EV_PEDANT" -a $IN_TYPE != none ] ; then
                pcont "<pedant> "
-               bin/pedant <$TDIR/$TEST.in | tr '\n' ' ' >&2
+               if [ "$EV_PEDANT" = 1 ] ; then
+                       EV_PEDANT=" "
+               fi
+               bin/pedant <$TDIR/$TEST.in >$TDIR/$TEST.pedant $EV_PEDANT
+               if [ -s $TDIR/$TEST.pedant ] ; then
+                       pend
+                       sed 's/^/\t/' <$TDIR/$TEST.pedant >&2
+                       pstart -e '\t'
+               fi
        fi
        case $OUT_TYPE in
                file)   echo "Output file: $PROBLEM.out"

diff --git a/config b/config
index e7a1f2bbbec9c120b4fa2784ff58d3b2baf5f754..3f870327547d8842e95e0151265821ef3f438755 100644 (file)
--- a/config
+++ b/config
@@ -142,7 +142,7 @@ FREE_PASCAL_RTE=1
 # DEBUG: Let `ev' run sample tests, too.
 #EV_SAMPLE=1
 
-# DEBUG: Run `pedant' on all input data
+# DEBUG: Run `pedant' on all input data. Set either to `1' or to pedant's options.
 #EV_PEDANT=1
 
 # DEBUG: Skip checks (useful when generating output files by running model solution)