Load Predefined Macros, Address many many Memory Leaks

.github/workflows/manual_valgrind.yml → .github/workflows/manual_leakcheck.yml

@@ -18,7 +18,12 @@ jobs:
       - name: Lib Install
         run: |
             sudo apt-get install valgrind
-            make all DEBUG=1
 
+      - name: Run Asan
+        run: |
+            make all DEBUG=2
+            ./build/dice d20
       - name: Run Valgrind
-        run: valgrind --leak-check=full ./build/dice d20
+        run: |
+            make all DEBUG=1
+            valgrind --leak-check=full ./build/dice d20

.github/workflows/test_binding_cpp.yml

@@ -16,7 +16,8 @@ jobs:
     - uses: actions/checkout@v3
     - name: make
       run: |
-        make CC=clang all
+        clang --version
+        make CC=clang DEBUG=0 all
         ./build/dice d20
 
   build_cpp:

Makefile

@@ -11,11 +11,15 @@ else
    STANDARD= -std=c99
 endif
 
-OPT=-O3 $(STANDARD) -Wall -Wextra -Werror -pedantic -Wcast-align \
+
+
+OPT=-O3 \
+    $(STANDARD) -Wall -Wextra -Werror -pedantic -Wcast-align \
 	-Wcast-qual -Wdisabled-optimization -Winit-self \
 	-Wmissing-declarations -Wmissing-include-dirs \
 	-Wredundant-decls -Wshadow -Wsign-conversion \
-	-Wundef -Wno-unused -Wformat=2
+	-Wundef -Wno-unused -Wformat=2 
+
 
 # -ffast-math # Problematic for Python 
 
@@ -26,13 +30,35 @@ OPT=-O3 $(STANDARD) -Wall -Wextra -Werror -pedantic -Wcast-align \
 # -Wlogical-op
 
 # === DEBUG OPTIONS ====
+
+ASAN_FLAGS= -fsanitize=address \
+	-fsanitize-recover=address \
+	-fsanitize-address-use-after-scope \
+	-fno-omit-frame-pointer -static-libasan -g
+GDB_FLAGS= -g -gdwarf-5
+
 DEBUG=0
 ifeq ($(DEBUG), 1)
-OPT=-O0 -g  # Valgrind info
+# Valgrind
+OPT=-O0 $(GDB_FLAGS)
 PARSER_DEBUG:=--debug --verbose
 else
+ifeq ($(DEBUG), 2)
+# ASAN
+OPT=-O0 $(ASAN_FLAGS)
+PARSER_DEBUG:=
+else
+ifeq ($(DEBUG), 3)
+# ASAN
+OPT=-O0 $(GDB_FLAGS) -lefence
+PARSER_DEBUG:=
+else
+# USUAL
 PARSER_DEBUG:=
 endif
+endif
+endif
+
 
 USE_SECURE_RANDOM=0
 ifeq ($(USE_SECURE_RANDOM), 1)
@@ -62,7 +88,7 @@ LEXER:=flex -f -Ca -Ce -Cr
 endif
 
 # add flags and the include paths
-DEFS=-DUSE_SECURE_RANDOM=${USE_SECURE_RANDOM} -DJUST_YACC=${YACC_FALLBACK} -DBREAKDOWN
+DEFS=-DUSE_SECURE_RANDOM=${USE_SECURE_RANDOM} -DJUST_YACC=${YACC_FALLBACK}
 
 CFLAGS=$(foreach D,$(INCDIRS),-I$(D)) $(OPT) $(DEFS)
 

reqs/requirements.txt

@@ -4,6 +4,7 @@ cppyy
 # tests
 pytest
 numpy>=1.22.2
+wurlitzer
 
 # distribution
 build

src/C++/main.cpp

@@ -4,16 +4,6 @@
 #include <string.h>
 #include "shared_header.h"
 
-int roll_full_options(
-    char* roll_request, 
-    char* log_file, 
-    int enable_verbosity, 
-    int enable_introspection,
-    int enable_mocking,
-    int mocking_type,
-    int mocking_seed
-);
-
 int main()
 {
   const char* fn = "out.dice";
@@ -27,6 +17,7 @@ int main()
     0,
     0,
     0,
+    0,
     0
   );
   assert(err_code == 0);

src/grammar/rolls/dice_enums.h → src/grammar/constructs/dice_enums.h

@@ -1,18 +1,18 @@
-#ifndef __DICE_ENUMS_H__
-#define __DICE_ENUMS_H__
-
-typedef enum {
-  // 0 is invalid
-  SYMBOLIC = 1,
-  NUMERIC = 2
-} DIE_TYPE;
-
-typedef enum {
-  NO_EXPLOSION = 0,
-  STANDARD_EXPLOSION = 1,
-  ONLY_ONCE_EXPLOSION = 2,
-  PENETRATING_EXPLOSION = 3,
-  DIMINISHING_EXPLOSION = 4
-} EXPLOSION_TYPE;
-
-#endif
+#ifndef __DICE_ENUMS_H__
+#define __DICE_ENUMS_H__
+
+typedef enum {
+  // 0 is invalid
+  SYMBOLIC = 1,
+  NUMERIC = 2
+} DIE_TYPE;
+
+typedef enum {
+  NO_EXPLOSION = 0,
+  STANDARD_EXPLOSION = 1,
+  ONLY_ONCE_EXPLOSION = 2,
+  PENETRATING_EXPLOSION = 3,
+  DIMINISHING_EXPLOSION = 4
+} EXPLOSION_TYPE;
+
+#endif

src/grammar/rolls/dice_roll_structs.h → src/grammar/constructs/roll_parameters.h

@@ -1,15 +1,15 @@
-#ifndef __DICE_ROLL_STRUCTS_H__
-#define __DICE_ROLL_STRUCTS_H__
-
-#include "dice_enums.h"
-
-typedef struct roll_params {
-  unsigned int number_of_dice;
-  unsigned int die_sides;
-  EXPLOSION_TYPE explode;
-  char** symbol_pool;
-  int start_value;
-  DIE_TYPE dtype;
-} roll_params;
-
-#endif
+#ifndef __DICE_ROLL_STRUCTS_H__
+#define __DICE_ROLL_STRUCTS_H__
+
+#include "constructs/dice_enums.h"
+
+typedef struct roll_params {
+  unsigned int number_of_dice;
+  unsigned int die_sides;
+  EXPLOSION_TYPE explode;
+  char** symbol_pool;
+  int start_value;
+  DIE_TYPE dtype;
+} roll_params;
+
+#endif

src/grammar/rolls/vec.h → src/grammar/constructs/vec.h

@@ -1,17 +1,19 @@
-#ifndef __VEC_H__
-#define __VEC_H__
-
-#include "dice_enums.h"
-#include "dice_roll_structs.h"
-
-typedef struct vec {
-  DIE_TYPE dtype;
-  int* content;
-  unsigned int length;
-  // TODO: Split length into content_length and symbol length
-  //  maybe use union? If it exists in c
-  char** symbols;
-  roll_params source;
-} vec;
-
-#endif
+#ifndef __VEC_H__
+#define __VEC_H__
+
+#include "constructs/dice_enums.h"
+#include "constructs/roll_parameters.h"
+#include <stdbool.h>
+
+typedef struct vec {
+  DIE_TYPE dtype;
+  int* content;
+  unsigned int length;
+  // TODO: Split length into content_length and symbol length
+  //  maybe use union? If it exists in c
+  char** symbols;
+  roll_params source;
+  bool has_source;
+} vec;
+
+#endif

src/grammar/dice.lex

@@ -6,7 +6,7 @@
     #include <stdio.h>
     #include "shared_header.h"
     #include "util/safe_functions.h"
-    #include "operations/condition_checking.h"
+    #include "operations/conditionals.h"
     #include "y.tab.h"
     #include <assert.h>
 
@@ -31,6 +31,7 @@
 
     vector.dtype = SYMBOLIC;
     vector.length = 1;
+    vector.has_source = false;
 
     yylval.values = vector;
     return CAPITAL_STRING;
@@ -43,6 +44,7 @@
 
     vector.content[0] = fast_atoi(yytext);
 
+    vector.has_source = false;
     vector.dtype = NUMERIC;
     vector.length = 1;
     yylval.values = vector;
@@ -80,6 +82,7 @@ d {
     vector.symbols[4] = zero;
     vector.symbols[5] = minus;
     vector.length = 6;
+    vector.has_source = false;
     yylval.values = vector;
 
     return(FATE_DIE);
@@ -100,6 +103,7 @@ d {
     vector.symbols[0] = plus;
     vector.symbols[1] = minus;
     vector.length = 2;
+    vector.has_source = false;
     yylval.values = vector;
 
     return(FATE_DIE);
@@ -123,6 +127,7 @@ d {
     vector.symbols[0] = plus;
     vector.symbols[1] = zero;
     vector.symbols[2] = minus;
+    vector.has_source = false;
     vector.length = 3;
     yylval.values = vector;
 
@@ -197,6 +202,7 @@ u {
     vector.content[0] = IS_UNIQUE;
     vector.dtype = NUMERIC;
     vector.length = 1;
+    vector.has_source = false;
     yylval.values = vector;
     return (UNIQUE);
 }
@@ -223,6 +229,7 @@ o {
     vector.content[0] = NOT_EQUAL;
     vector.dtype = NUMERIC;
     vector.length = 1;
+    vector.has_source = false;
     yylval.values = vector;
     return NE;
 }
@@ -233,6 +240,7 @@ o {
     vector.content[0] = EQUALS;
     vector.dtype = NUMERIC;
     vector.length = 1;
+    vector.has_source = false;
     yylval.values = vector;
     return EQ;
 }
@@ -243,6 +251,7 @@ o {
     vector.content[0] = LESS_THAN;
     vector.dtype = NUMERIC;
     vector.length = 1;
+    vector.has_source = false;
     yylval.values = vector;
     return LT;
 }
@@ -252,6 +261,7 @@ o {
     if(gnoll_errno){yyerror("Memory Err");}
     vector.content[0] = GREATER_THAN;
     vector.dtype = NUMERIC;
+    vector.has_source = false;
     vector.length = 1;
     yylval.values = vector;
     return GT;
@@ -263,6 +273,7 @@ o {
     vector.content[0] = LESS_OR_EQUALS;
     vector.dtype = NUMERIC;
     vector.length = 1;
+    vector.has_source = false;
     yylval.values = vector;
     return(LE);
 }
@@ -273,6 +284,7 @@ o {
     vector.content[0] = GREATER_OR_EQUALS;
     vector.dtype = NUMERIC;
     vector.length = 1;
+    vector.has_source = false;
     yylval.values = vector;
     return(GE);
 }
@@ -283,6 +295,7 @@ is_even {
     vector.content[0] = IF_EVEN;
     vector.dtype = NUMERIC;
     vector.length = 1;
+    vector.has_source = false;
     yylval.values = vector;
     return(IS_EVEN);
 }
@@ -293,6 +306,7 @@ is_odd {
     vector.content[0] = IF_ODD;
     vector.dtype = NUMERIC;
     vector.length = 1;
+    vector.has_source = false;
     yylval.values = vector;
     return(IS_ODD);
 }