# HG changeset patch
# User Peter Kovacs <kpeter@inf.elte.hu>
# Date 1224499599 -7200
# Node ID d900fd1e760fe35dddfa29d9b00de1a9e9f6323e
# Parent cdbff91c2166a1222fc3a1295f1f4597b6412425
Print the failed line numbers in the unifier script (ticket #138)
diff --git a/lemon/bfs.h b/lemon/bfs.h
|
a
|
b
|
|
| 51 | 51 | typedef typename Digraph::template NodeMap<typename Digraph::Arc> PredMap; |
| 52 | 52 | ///Instantiates a PredMap. |
| 53 | 53 | |
| 54 | | ///This function instantiates a PredMap. |
| | 54 | ///This function instantiates a PredMap. |
| 55 | 55 | ///\param g is the digraph, to which we would like to define the |
| 56 | 56 | ///PredMap. |
| 57 | 57 | static PredMap *createPredMap(const Digraph &g) |
| … |
… |
|
| 80 | 80 | |
| 81 | 81 | ///The type of the map that indicates which nodes are reached. |
| 82 | 82 | |
| 83 | | ///The type of the map that indicates which nodes are reached. |
| 84 | | ///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept. |
| | 83 | ///The type of the map that indicates which nodes are reached.///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept. |
| 85 | 84 | typedef typename Digraph::template NodeMap<bool> ReachedMap; |
| 86 | 85 | ///Instantiates a ReachedMap. |
| 87 | 86 | |
diff --git a/lemon/list_graph.h b/lemon/list_graph.h
|
a
|
b
|
|
| 840 | 840 | explicit Arc(int pid) { id = pid;} |
| 841 | 841 | |
| 842 | 842 | public: |
| 843 | | operator Edge() const { |
| 844 | | return id != -1 ? edgeFromId(id / 2) : INVALID; |
| | 843 | operator Edge() const { |
| | 844 | return id != -1 ? edgeFromId(id / 2) : INVALID; |
| 845 | 845 | } |
| 846 | 846 | |
| 847 | 847 | Arc() {} |
diff --git a/lemon/smart_graph.h b/lemon/smart_graph.h
|
a
|
b
|
|
| 464 | 464 | explicit Arc(int id) { _id = id;} |
| 465 | 465 | |
| 466 | 466 | public: |
| 467 | | operator Edge() const { |
| 468 | | return _id != -1 ? edgeFromId(_id / 2) : INVALID; |
| | 467 | operator Edge() const { |
| | 468 | return _id != -1 ? edgeFromId(_id / 2) : INVALID; |
| 469 | 469 | } |
| 470 | 470 | |
| 471 | 471 | Arc() {} |
diff --git a/scripts/unify-sources.sh b/scripts/unify-sources.sh
|
a
|
b
|
|
| 88 | 88 | function check_action() { |
| 89 | 89 | if ! diff -q $1 $2 >/dev/null |
| 90 | 90 | then |
| 91 | | echo -n " [$3 failed]" |
| | 91 | echo |
| | 92 | echo -n " $3 failed at line(s): " |
| | 93 | echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" | |
| | 94 | sed "s/,/-/g" | paste -s -d',') |
| 92 | 95 | FAILED=YES |
| 93 | 96 | fi |
| 94 | 97 | } |
| 95 | 98 | |
| 96 | 99 | function check_warning() { |
| 97 | | echo -n " [$2 warning]" |
| | 100 | echo |
| | 101 | if [ "$2" == 'long lines' ] |
| | 102 | then |
| | 103 | echo -n " $2 warning at line(s): " |
| | 104 | echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" | |
| | 105 | cut -f 1 | paste -s -d',') |
| | 106 | else |
| | 107 | echo -n " $2 warning" |
| | 108 | fi |
| 98 | 109 | WARNED=YES |
| 99 | 110 | } |
| 100 | 111 | |