suppress unused variable warnings with UNUSED macro

examples/core/01_one_sample/example.c

@@ -5,11 +5,13 @@
 // Estimate functions
 double sample_0(uint64_t* seed)
 {
+    UNUSED(seed);
     return 0;
 }
 
 double sample_1(uint64_t* seed)
 {
+    UNUSED(seed);
     return 1;
 }
 

examples/core/02_time_to_botec/example.c

@@ -12,8 +12,8 @@ int main()
     double p_b = 0.5;
     double p_c = p_a * p_b;
 
-    double sample_0(uint64_t * seed) { return 0; }
-    double sample_1(uint64_t * seed) { return 1; }
+    double sample_0(uint64_t * seed) { UNUSED(seed); return 0; }
+    double sample_1(uint64_t * seed) { UNUSED(seed); return 1; }
     double sample_few(uint64_t * seed) { return sample_to(1, 3, seed); }
     double sample_many(uint64_t * seed) { return sample_to(2, 10, seed); }
 

examples/core/03_gcc_nested_function/example.c

@@ -15,8 +15,8 @@ int main()
     int n_dists = 4;
 
     // These are nested functions. They will not compile without gcc.
-    double sample_0(uint64_t * seed) { return 0; }
-    double sample_1(uint64_t * seed) { return 1; }
+    double sample_0(uint64_t * seed) { UNUSED(seed); return 0; }
+    double sample_1(uint64_t * seed) { UNUSED(seed); return 1; }
     double sample_few(uint64_t * seed) { return sample_to(1, 3, seed); }
     double sample_many(uint64_t * seed) { return sample_to(2, 10, seed); }
 

examples/core/makefile

@@ -23,9 +23,8 @@ DEPS=$(SQUIGGLE) $(MATH)
 
 ## Flags
 DEBUG= #'-g'
-WARN=-Wall -Wextra -Wno-unused-parameter
+WARN=-Wall -Wextra 
 STANDARD=-std=c99
-WARNINGS=-Wall
 OPTIMIZED=-O3  #-Ofast
 
 ## Formatter
@@ -34,10 +33,10 @@ FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT)
 
 ## make all
 all:
-	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 00_example_template/$(SRC)    $(DEPS) -o 00_example_template/$(OUTPUT)
-	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 01_one_sample/$(SRC)          $(DEPS) -o 01_one_sample/$(OUTPUT)
-	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 02_time_to_botec/$(SRC)       $(DEPS) -o 02_time_to_botec/$(OUTPUT)
-	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 03_gcc_nested_function/$(SRC) $(DEPS) -o 03_gcc_nested_function/$(OUTPUT)
+	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 00_example_template/$(SRC) $(DEPS) -o 00_example_template/$(OUTPUT)
+	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 01_one_sample/$(SRC) $(DEPS) -o 01_one_sample/$(OUTPUT)
+	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 02_time_to_botec/$(SRC) $(DEPS) -o 02_time_to_botec/$(OUTPUT)
+	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN)  03_gcc_nested_function/$(SRC) $(DEPS) -o 03_gcc_nested_function/$(OUTPUT)
 	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 04_gamma_beta/$(SRC)          $(DEPS) -o 04_gamma_beta/$(OUTPUT)
 	$(CC) $(OPTIMIZED) $(DEBUG) $(WARN) 05_hundred_lognormals/$(SRC)  $(DEPS) -o 05_hundred_lognormals/$(OUTPUT)
 

examples/more/10_twitter_thread_example/example.c

@@ -5,11 +5,13 @@
 
 double sample_0(uint64_t* seed)
 {
+    UNUSED(seed); 
     return 0;
 }
 
 double sample_1(uint64_t* seed)
 {
+    UNUSED(seed); 
     return 1;
 }
 

examples/more/12_time_to_botec_parallel/example.c

@@ -9,8 +9,8 @@ int main()
     double p_b = 0.5;
     double p_c = p_a * p_b;
 
-    double sample_0(uint64_t * seed) { return 0; }
-    double sample_1(uint64_t * seed) { return 1; }
+    double sample_0(uint64_t * seed) { UNUSED(seed); return 0; }
+    double sample_1(uint64_t * seed) { UNUSED(seed); return 1; }
     double sample_few(uint64_t * seed) { return sample_to(1, 3, seed); }
     double sample_many(uint64_t * seed) { return sample_to(2, 10, seed); }
 

examples/more/makefile

@@ -25,7 +25,7 @@ DEPS=$(SQUIGGLE) $(SQUIGGLE_MORE) $(MATH) $(OPENMP)
 
 ## Flags
 DEBUG= #'-g'
-WARN=-Wall -Wextra -Wno-unused-parameter
+WARN=-Wall -Wextra 
 STANDARD=-std=c99
 WARNINGS=-Wall
 OPTIMIZED=-O3  #-Ofast

squiggle.c

@@ -3,9 +3,11 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-// math constants
+// Defs
 #define PI 3.14159265358979323846 // M_PI in gcc gnu99
 #define NORMAL90CONFIDENCE 1.6448536269514727
+#define UNUSED(x) (void)(x)
+// ^ https://stackoverflow.com/questions/3599160/how-can-i-suppress-unused-parameter-warnings-in-c
 
 // Pseudo Random number generators
 

squiggle.h

@@ -30,4 +30,7 @@ double array_std(double* array, int length);
 // Mixture function
 double sample_mixture(double (*samplers[])(uint64_t*), double* weights, int n_dists, uint64_t* seed);
 
+// Trick to mute unused variable warning. Useful for nested functions
+#define UNUSED(x) (void)(x)
+
 #endif

squiggle_more.c

@@ -83,6 +83,10 @@ static void swp(int i, int j, double xs[])
 
 static int partition(int low, int high, double xs[], int length)
 {
+    if(low > high || high >= length){
+        printf("Invariant violated for function partition in %s (%d)", __FILE__, __LINE__);
+        exit(1);
+    }
     // Note: the scratchpad/ folder in commit 578bfa27 has printfs sprinkled throughout
     int pivot = low + floor((high - low) / 2);
     double pivot_value = xs[pivot];
@@ -136,6 +140,7 @@ ci array_get_90_ci(double xs[], int n)
 
 ci sampler_get_ci(ci interval, double (*sampler)(uint64_t*), int n, uint64_t* seed)
 {
+    UNUSED(seed); // don't want to use it right now, but want to preserve ability to do so (e.g., remove parallelism from internals). Also nicer for consistency.
     double* xs = malloc(n * sizeof(double));
     sampler_parallel(sampler, xs, 16, n);
     ci result = array_get_ci(interval, xs, n);
@@ -216,7 +221,7 @@ typedef struct box_t {
 box process_error(const char* error_msg, int should_exit, char* file, int line)
 {
     if (should_exit) {
-        printf("@, in %s (%d)", file, line);
+        printf("%s, @, in %s (%d)", error_msg, file, line);
         exit(1);
     } else {
         char error_msg[MAX_ERROR_LENGTH];