Changeset 341:d900fd1e760f in lemon

Timestamp:

10/20/08 12:46:39 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Print the failed line numbers in the unifier script (ticket #138)

Files:

• lemon/bfs.h (modified) (2 diffs)
• lemon/list_graph.h (modified) (1 diff)
• lemon/smart_graph.h (modified) (1 diff)
• scripts/unify-sources.sh (modified) (2 diffs)

lemon/bfs.h

@@ -52 +52 @@
     ///Instantiates a PredMap.
 
-    ///This function instantiates a PredMap.
+    ///This function instantiates a PredMap.  
     ///\param g is the digraph, to which we would like to define the
     ///PredMap.
@@ -81 +81 @@
     ///The type of the map that indicates which nodes are reached.
 
-    ///The type of the map that indicates which nodes are reached.
-    ///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept.
+    ///The type of the map that indicates which nodes are reached.///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept.
     typedef typename Digraph::template NodeMap<bool> ReachedMap;
     ///Instantiates a ReachedMap.

lemon/list_graph.h

@@ -841 +841 @@
 
     public:
-      operator Edge() const { 
-        return id != -1 ? edgeFromId(id / 2) : INVALID; 
+      operator Edge() const {
+        return id != -1 ? edgeFromId(id / 2) : INVALID;
       }
 

lemon/smart_graph.h

@@ -465 +465 @@
 
     public:
-      operator Edge() const { 
-        return _id != -1 ? edgeFromId(_id / 2) : INVALID; 
+      operator Edge() const {
+        return _id != -1 ? edgeFromId(_id / 2) : INVALID;
       }
 

scripts/unify-sources.sh

@@ -89 +89 @@
     if ! diff -q $1 $2 >/dev/null
     then
-        echo -n " [$3 failed]"
+        echo
+        echo -n "      $3 failed at line(s): "
+        echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" | 
+                  sed "s/,/-/g" | paste -s -d',')
         FAILED=YES
     fi
@@ -95 +98 @@
 
 function check_warning() {
-    echo -n " [$2 warning]"
+    echo
+    if [ "$2" == 'long lines' ]
+    then
+        echo -n "      $2 warning at line(s): "
+        echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" | 
+                  cut -f 1 | paste -s -d',')
+    else
+        echo -n "      $2 warning"
+    fi
     WARNED=YES
 }