break up complement.c into bfun.c, bfun.h, and main.c

Author: rose

complement.c renamed to bfun.c

@@ -1,88 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <limits.h>
-
-#include "utils.h"
-#include "cubelist.h"
-
-
-// bfun* constructors
-bfun* bf_new_var (int v);
-bfun* bool_to_bf (bfun* b, bool bl);
-bfun* empty_bf(bfun* b);
-
-// single bfun* functions
-bfun* complement(bfun* b);
-bfun* try_simplify(bfun* b);
-bool has_all_dc(bfun* b);
-
-// combining bfun*s
-void append_cubes(bfun* b, bfun* g);
-bfun* or(bfun* b, bfun* g);
-
-// bfun*s & variables
-void and_var(bfun* b, int var);
-int best_split(bfun* b);
-bfun* pos_co(bfun* b, int x);
-bfun* neg_co(bfun* b, int x);
-
-
-int main(int argc, char* argv[]) {
-  char* filename;
-  if (argc > 1) filename = argv[1];
-  else filename = "foo";
-  char* out_file = "out.txt";
-
-  int vs = 4;
-
-  /*
-  cube* plain = new_cube(vs);
-  cube* one_false = new_cube(vs);
-  set_false(one_false, 1);
-  */
-  cube* one_true = new_cube(vs);
-  set_true(one_true, 1);
-  cube* one_each = new_cube(vs);
-  set_false(one_each, 1);
-  set_true(one_each, 2);
-
-  cube_list* test1 = new_cube_list(vs);
-  add_cube(test1, one_each);
-  add_cube(test1, one_true);
-
-  printf("\nComplementing...\n");
-  print_bfun(test1);
-
-  bfun* result = complement(test1);
-  printf("\n************************************\n");
-  printf("\nResult is:\n");
-  print_bfun(result);
-  printf("\n************************************\n");
-
-  del_bfun(test1);
-  del_bfun(result);
-  /*
-  del_cube(plain, vs);
-  del_cube(one_true, vs);
-  del_cube(one_false, vs);
-  del_cube(one_each, vs);
-  */
-
-  bfun* b = read_file(filename);
-  bfun* cb = complement(b);
-  
-  printf("\n************************************\n");
-  printf("\nResult is:\n");
-  print_bfun(cb);
-  printf("\n************************************\n");
-
-  write_file(out_file, cb);
-
-  del_bfun(b);
-  del_bfun(cb);
-}
-
+#include "bfun.h"
 
 bfun* complement (bfun* b_initial) {
   // does not free argument.  

bfun.h

@@ -0,0 +1,29 @@
+#ifndef _BFUN_H
+#define _BFUN_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <limits.h>
+
+#include "utils.h"
+#include "cubelist.h"
+
+
+// single bfun* functions
+bfun* complement(bfun* b);
+bfun* try_simplify(bfun* b);
+bool has_all_dc(bfun* b);
+
+// combining bfun*s
+void append_cubes(bfun* b, bfun* g);
+bfun* or(bfun* b, bfun* g);
+
+// bfun*s & variables
+void and_var(bfun* b, int var);
+int best_split(bfun* b);
+bfun* pos_co(bfun* b, int x);
+bfun* neg_co(bfun* b, int x);
+
+#endif // _BFUN_H
+

main.c

@@ -0,0 +1,57 @@
+#include "bfun.h"
+
+int main(int argc, char* argv[]) {
+  char* filename;
+  if (argc > 1) filename = argv[1];
+  else filename = "foo";
+  char* out_file = "out.txt";
+
+  int vs = 4;
+
+  /*
+  cube* plain = new_cube(vs);
+  cube* one_false = new_cube(vs);
+  set_false(one_false, 1);
+  */
+  cube* one_true = new_cube(vs);
+  set_true(one_true, 1);
+  cube* one_each = new_cube(vs);
+  set_false(one_each, 1);
+  set_true(one_each, 2);
+
+  cube_list* test1 = new_cube_list(vs);
+  add_cube(test1, one_each);
+  add_cube(test1, one_true);
+
+  printf("\nComplementing...\n");
+  print_bfun(test1);
+
+  bfun* result = complement(test1);
+  printf("\n************************************\n");
+  printf("\nResult is:\n");
+  print_bfun(result);
+  printf("\n************************************\n");
+
+  del_bfun(test1);
+  del_bfun(result);
+  /*
+  del_cube(plain, vs);
+  del_cube(one_true, vs);
+  del_cube(one_false, vs);
+  del_cube(one_each, vs);
+  */
+
+  bfun* b = read_file(filename);
+  bfun* cb = complement(b);
+  
+  printf("\n************************************\n");
+  printf("\nResult is:\n");
+  print_bfun(cb);
+  printf("\n************************************\n");
+
+  write_file(out_file, cb);
+
+  del_bfun(b);
+  del_bfun(cb);
+}
+