Forgotten patch for Boog & Nero getopt (contributed by N. Shimizu).

alliance/src/boog/src/bog_lib_reader.c

@@ -149,7 +149,7 @@ static int distribCell(befig_list* befig)
          }
 
          /*patterns aren't equal, new is more precise*/
-         if (!biabl_befig) continue;
+         if (biabl_befig) continue;
          
          /*patterns are equal -->comparison*/
          if (cell->AREA<getgenericarea(befig)) return 0;  /*don't use the new*/

alliance/src/boog/src/bog_map_pattern.c

@@ -413,7 +413,9 @@ extern cell_list* cell_pattern(chain_list* expr)
 
       /*improve speed*/
       if (ABL_ATOM(cell->ABL)!=ABL_ATOM(expr)) continue;
-      
+      if (ABL_ATOM(expr)&&
+          ((ABL_ATOM_VALUE(expr)==getablatomzero() || ABL_ATOM_VALUE(expr)==getablatomone())
+        && ABL_ATOM_VALUE(expr)!=ABL_ATOM_VALUE(cell->ABL))) continue;      
       /*improve speed*/
       if (!ABL_ATOM(expr) && ABL_OPER(expr)!=ABL_NOT/*match all*/) {
          if (ABL_ARITY(cell->ABL)!=ABL_ARITY(expr)) continue;

alliance/src/nero/src/UDefs.h

@@ -38,7 +38,7 @@
 # include  <cstdlib>
 # include  <cmath>
 
-# include  <unistd.h>
+//# include  <unistd.h>
 
 
 

alliance/src/nero/src/UOpts.cpp

@@ -16,12 +16,11 @@
 
 
 
-# include  "unistd.h"
+//# include  "unistd.h"
 # include  "UDefs.h"
 
 
 
-
 //  +----------------------------------------------------------------+
 //  |                     Methods Definitions                        |
 //  +----------------------------------------------------------------+
@@ -127,7 +126,7 @@ void COpts::getopts (int argc, char *argv[]) throw (except_done)
 
   short_format = tShort.c_str();
 
-  // Loop over getopt.
+// Loop over getopt.
   while (true) {
     key = getopt (argc, argv, short_format);
 

alliance/src/nero/src/nero.cpp

@@ -17,6 +17,11 @@
 
 
 # include  "RDefs.h"
+# ifdef __ CYGWIN__
+extern "C" {
+  int getopt ( int argc, char * const argv[], const char *optstring );
+}
+# endif