[gnugo-devel] trevor_1_14.4

[Trevor Morris]

 - add file & line numbers to more warnings in mkpat.c

Note: two of the patterns in CVS currently generate warnings.

Also (not included in the patch):
  rather than, for example:
        cat $(srcdir)/attack.db | ./mkpat -X attpat >apatterns.c
  the following is preferable:
        ./mkpat -X attpat -i $(srcdir)/attack.db -o apatterns.c

This gives mkpat the ability to better control it's own output,
including the better error reporting, or the option to blow away
the output file on error - thus generating a rebuild correctly.



http://www.public32.com/games/go/trevor_1_14.4

Index: patterns/mkpat.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/mkpat.c,v
retrieving revision 1.28
diff -u -r1.28 mkpat.c
--- patterns/mkpat.c    2001/11/14 19:16:28     1.28
+++ patterns/mkpat.c    2001/11/15 14:24:52
@@ -854,36 +854,36 @@
   case '+' :
     if (where & (NORTH_EDGE|EAST_EDGE|SOUTH_EDGE|WEST_EDGE))
       fprintf(stderr,
-             "Warning : symmetry inconsistent with edge constraints (pattern
%s)\n", 
-             pattern_names[patno]);
+             "%s(%d) : Warning : symmetry inconsistent with edge constraints
(pattern %s)\n", 
+             current_file, current_line_number, pattern_names[patno]);
     pattern[patno].trfno = 2;
     break;
 
   case 'X' : 
     if (where & (NORTH_EDGE|EAST_EDGE|SOUTH_EDGE|WEST_EDGE))
       fprintf(stderr,
-             "Warning : X symmetry inconsistent with edge constraints (pattern
%s)\n", 
-             pattern_names[patno]);
+             "%s(%d) : Warning : X symmetry inconsistent with edge constraints
(pattern %s)\n", 
+             current_file, current_line_number, pattern_names[patno]);
     if (maxi != maxj)
       fprintf(stderr,
-             "Warning : X symmetry requires a square pattern (pattern %s)\n",
-             pattern_names[patno]);
+             "%s(%d) : Warning : X symmetry requires a square pattern (pattern
%s)\n",
+             current_file, current_line_number, pattern_names[patno]);
     pattern[patno].trfno = 2;
     break;
 
   case '-' :
     if (where & (NORTH_EDGE|SOUTH_EDGE))
       fprintf(stderr,
-             "Warning : symmetry inconsistent with edge constraints (pattern
%s)\n", 
-             pattern_names[patno]);
+             "%s(%d) : Warning : symmetry inconsistent with edge constraints
(pattern %s)\n", 
+             current_file, current_line_number, pattern_names[patno]);
     pattern[patno].trfno = 4;
     break;
     
   case '|' :
     if (where & (EAST_EDGE|WEST_EDGE))
       fprintf(stderr,
-             "Warning : symmetry inconsistent with edge constraints (pattern
%s)\n", 
-             pattern_names[patno]);
+             "%s(%d) : Warning : symmetry inconsistent with edge constraints
(pattern %s)\n", 
+             current_file, current_line_number, pattern_names[patno]);
     pattern[patno].trfno = 4;
     break;
 
@@ -894,8 +894,8 @@
     */
     if (maxi != maxj)
       fprintf(stderr,
-             "Warning : \\ or / symmetry requires a square pattern (pattern
%s)\n", 
-             pattern_names[patno]);
+             "%s(%d) : Warning : \\ or / symmetry requires a square pattern
(pattern %s)\n", 
+             current_file, current_line_number, pattern_names[patno]);
 
     pattern[patno].trfno = 4;
     break;
@@ -903,15 +903,15 @@
   case 'O' :
     if (where & (NORTH_EDGE|EAST_EDGE|SOUTH_EDGE|WEST_EDGE))
       fprintf(stderr,
-             "Warning : symmetry inconsistent with edge constraints (pattern
%s)\n", 
-             pattern_names[patno]);
+             "%s(%d) : Warning : symmetry inconsistent with edge constraints
(pattern %s)\n", 
+             current_file, current_line_number, pattern_names[patno]);
     pattern[patno].trfno = 5;  /* Ugly special convention. */
     break;
 
   default:
     fprintf(stderr,
-           "Warning : symmetry character '%c' not implemented - using '8'
(pattern %s)\n", 
-           symmetry, pattern_names[patno]);
+           "%s(%d) : Warning : symmetry character '%c' not implemented - using
'8' (pattern %s)\n", 
+           current_file, current_line_number, symmetry, pattern_names[patno]);
     /* FALLTHROUGH */
   case '8' :
     pattern[patno].trfno = 8;