Fixed major issue with updatinglife-1.5.2

Related to 1.5.1 change to use 'has' with updatemap
- Caused by missing "not" keyword
Add B{0..9}/S{0..9} in rule selection for ease
Moved macro definitions to life-macros.h
Tarballed and signed life-1.5.2

Signed-off-by: Aiden Woodruff <aiden.woodruff@gmail.com>

14 files changed, 42 insertions, 44 deletions

diff --git a/Makefile.am b/Makefile.am
index e9bb78a..1d77ffd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AM_OPTIONS = gnu
 bin_PROGRAMS = life
 life_SOURCES = life.c cmdline-life.c updatemap.c menus.c
-life_CFLAGS = -I$(srcdir)
+life_CFLAGS = -I$(srcdir) -Wall -pedantic
 include_HEADERS = life.h updatemap.h menus.h cmdline-life.h
 man_MANS = life.6
 EXTRA_DIST = $(man_MANS)
diff --git a/Makefile.in b/Makefile.in
index 20279d8..7b20984 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,7 +312,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_OPTIONS = gnu
 life_SOURCES = life.c cmdline-life.c updatemap.c menus.c
-life_CFLAGS = -I$(srcdir)
+life_CFLAGS = -I$(srcdir) -Wall -pedantic
 include_HEADERS = life.h updatemap.h menus.h cmdline-life.h
 man_MANS = life.6
 EXTRA_DIST = $(man_MANS)
diff --git a/configure b/configure
index 20a362a..cb1f77e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for life 1.5.1.
+# Generated by GNU Autoconf 2.69 for life 1.5.2.
 #
 # Report bugs to <aiden.woodruff@gmail.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='life'
 PACKAGE_TARNAME='life'
-PACKAGE_VERSION='1.5.1'
-PACKAGE_STRING='life 1.5.1'
+PACKAGE_VERSION='1.5.2'
+PACKAGE_STRING='life 1.5.2'
 PACKAGE_BUGREPORT='aiden.woodruff@gmail.com'
 PACKAGE_URL=''
 
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures life 1.5.1 to adapt to many kinds of systems.
+\`configure' configures life 1.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1344,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of life 1.5.1:";;
+     short | recursive ) echo "Configuration of life 1.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1435,7 +1435,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-life configure 1.5.1
+life configure 1.5.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1804,7 +1804,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by life $as_me 1.5.1, which was
+It was created by life $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4306,7 +4306,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='life'
- VERSION='1.5.1'
+ VERSION='1.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5057,7 +5057,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by life $as_me 1.5.1, which was
+This file was extended by life $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5123,7 +5123,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-life config.status 1.5.1
+life config.status 1.5.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 14d78b8..3174aa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([life], [1.5.1], [aiden.woodruff@gmail.com])
+AC_INIT([life], [1.5.2], [aiden.woodruff@gmail.com])
 AC_CONFIG_SRCDIR([life.c])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/life-1.5.1.tar.gz b/life-1.5.1.tar.gz
deleted file mode 100644
index 5a4222e..0000000
--- a/life-1.5.1.tar.gz
+++ /dev/null
diff --git a/life-1.5.2.tar.gz b/life-1.5.2.tar.gz
new file mode 100644
index 0000000..d631ed3
--- /dev/null
+++ b/life-1.5.2.tar.gz
diff --git a/life-1.5.2.tar.gz.sig b/life-1.5.2.tar.gz.sig
new file mode 100644
index 0000000..f9b8200
--- /dev/null
+++ b/life-1.5.2.tar.gz.sig
diff --git a/life-macros.h b/life-macros.h
new file mode 100644
index 0000000..32eb3f0
--- /dev/null
+++ b/life-macros.h
@@ -0,0 +1,10 @@
+#ifndef has
+#define has(var, bit) (((var) & (bit)) == (bit))
+#endif
+
+#ifndef foreach
+#define foreach(func, count, first,...)                         \
+  {typeof(first) things[] = {__VA_ARGS__};                      \
+    func(first);                                                \
+    for (int _i = 0; _i < count - 1; _i++) func(things[_i]);}
+#endif
diff --git a/life.c b/life.c
index 4c698b2..dafb8af 100644
--- a/life.c
+++ b/life.c
@@ -21,22 +21,11 @@
 
 #ifndef stat_bar_print
 // Print text to status bar in the nice way, without erasing or refreshing
-#define stat_bar_print(win, fmt,...)                                    \
-  wprintw(win, fmt, ##__VA_ARGS__);                                     \
+#define stat_bar_print(win,...)                                    \
+  wprintw(win, __VA_ARGS__);                                     \
   for (int _i = getcurx(win); _i < COLS; _i++) waddch(win, ' ');
 #endif
 
-#ifndef foreach
-#define foreach(func, count, first,...)                         \
-  {typeof(first) things[] = {__VA_ARGS__};                      \
-    func(first);                                                \
-    for (int _i = 0; _i < count - 1; _i++) func(things[_i]);}
-#endif
-
-#ifndef has
-#define has(var, bit) ((var & bit) == bit)
-#endif
-
 int main (int argc, char * argv[]) {
   unsigned int RULE = 0;
   struct gengetopt_args_info args_info;
diff --git a/life.h b/life.h
index ecde3aa..bad4815 100644
--- a/life.h
+++ b/life.h
@@ -29,6 +29,7 @@
 #include <ncurses.h>
 
 // Project Libraries
+#include "life-macros.h"
 #include "cmdline-life.h"
 #include "updatemap.h"
 #include "menus.h"
diff --git a/menus.c b/menus.c
index 1c1414a..7c2abd8 100644
--- a/menus.c
+++ b/menus.c
@@ -19,10 +19,6 @@
  */
 #include "menus.h"
 
-#ifndef has
-#define has(var, bit) ((var & bit) == bit)
-#endif
-
 int print_copying_warranty (WINDOW * win) {
   const char * WARRANTY = "  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.\n  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.\n  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.\n  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.";
   return waddstr(win, WARRANTY);
@@ -75,6 +71,7 @@ int fancy_rules (WINDOW * win, int ruleint, int speed) {
     werase(win);
     waddstr(win, "Press space to toggle buttons\n");
     wprintw(win, "Rule int: %d\n", ruleint);
+    waddstr(win, "B012345678/S012345678\n");
     waddch(win, 'B');
     for (int i = 0; i < 9; i++) {
       if (cursor == i) {
@@ -157,13 +154,14 @@ int fancy_rules (WINDOW * win, int ruleint, int speed) {
     } else if (ch == ' ' || ch == '\n') {
       switch (cursor) {
       case 18:
-        return -1;
+        ruleint = -1;
+        done = TRUE;
         break;
       case 19:
         ruleint = 6152;
         break;
       case 20:
-        return ruleint;
+        done = TRUE;
         break;
       default:
         ruleint ^= 1 << cursor;
@@ -174,5 +172,5 @@ int fancy_rules (WINDOW * win, int ruleint, int speed) {
       ch = wgetch(win);
     }
   }
-  ch = 0;
+  return ruleint;
 }
diff --git a/menus.h b/menus.h
index ad385e2..26da8f5 100644
--- a/menus.h
+++ b/menus.h
@@ -23,6 +23,8 @@
 
 #include <ncurses.h>
 
+#include "life-macros.h"
+
 #ifndef LIFE_MENUS_H_
 #define LIFE_MENUS_H_
 
diff --git a/updatemap.c b/updatemap.c
index d965a53..539def8 100644
--- a/updatemap.c
+++ b/updatemap.c
@@ -19,10 +19,6 @@
  */
 #include "updatemap.h"
 
-#ifndef has
-#define has(var, bit) ((var & bit) == bit)
-#endif
-
 char * update_map (char * base_map, const int width, const int height, char livecell, char deadcell, const unsigned int ruleint) {
   char * intermap = (char*) strndup(base_map, width * height);
   for (int i = 0, x = 0, y = 0, surround = 0; i < width*height; i++, surround = 0) {
@@ -39,19 +35,19 @@ char * update_map (char * base_map, const int width, const int height, char live
     if (x > 0) {
       if (base_map[i-1] == livecell) surround++; // B1
       if (y > 0) {
-        if (base_map[i-width-1] == livecell) surround++; // A1
+        if (base_map[i-width-1] == livecell) surround++; // A1
       }
       if (y < height - 1) {
-        if (base_map[i-1+width] == livecell) surround++; // C1
+        if (base_map[i-1+width] == livecell) surround++; // C1
       }
     }
     if (x < width - 1) {
       if (base_map[i+1] == livecell) surround++; // B3
       if (y > 0) {
-        if (base_map[i+1-width] == livecell) surround++; // A3
+        if (base_map[i+1-width] == livecell) surround++; // A3
       }
       if (y < height - 1) {
-        if (base_map[i + 1 + width] == livecell) surround++; // C3
+        if (base_map[i + 1 + width] == livecell) surround++; // C3
       }
     }
     if (y > 0) {
@@ -62,11 +58,11 @@ char * update_map (char * base_map, const int width, const int height, char live
     }
     if (base_map[i] == deadcell) {
       if (has(ruleint, 1 << surround)) {
-        intermap[i] = livecell;
+        intermap[i] = livecell;
       }
     } else if (base_map[i] == livecell) {
-      if (has(ruleint, 1 << surround + 9)) {
-        intermap[i] = deadcell;
+      if (!has(ruleint, 1 << (surround + 9))) {
+        intermap[i] = deadcell;
       }
     }
   }
diff --git a/updatemap.h b/updatemap.h
index 32331b0..6773998 100644
--- a/updatemap.h
+++ b/updatemap.h
@@ -20,6 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "life-macros.h"
+
 #ifndef LIFE_UPDATEMAP_H_
 #define LIFE_UPDATEMAP_H_