Huge numbers for dice

.github/workflows/lint_codeQL.yml

@@ -39,6 +39,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
+      with:
+        submodules: true
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/test_OS.yml

@@ -19,6 +19,8 @@ jobs:
       with:
         python-version: '3.x'
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: Install dependencies
       run: |
         python -m pip install -r reqs/requirements.txt
@@ -49,6 +51,8 @@ jobs:
           python3.10-venv
 
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: test
       shell: wsl-bash {0}
       run: |
@@ -59,6 +63,8 @@ jobs:
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: Build
         run: make all
       - name: Test

.github/workflows/test_core.yml

@@ -14,6 +14,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: Set up Python
       uses: actions/setup-python@v3
       with:

.github/workflows/test_language_bindings.yml

@@ -38,6 +38,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: make
       run:  |
         make cpp
@@ -49,6 +51,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: prereqs
       # https://linuxize.com/post/how-to-install-mono-on-ubuntu-20-04/
       run:  |
@@ -68,6 +72,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: go install
       run: sudo apt install golang-go
     - name: make go
@@ -80,6 +86,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: dep install
       run: |
         sudo apt update
@@ -98,6 +106,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: java dependencies
       run: |
         sudo apt-get update
@@ -113,6 +123,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: Install LLVM and Clang
       uses: KyleMayes/install-llvm-action@v1
       with:
@@ -149,6 +161,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: julia install
       run: |
         wget https://julialang-s3.julialang.org/bin/linux/x64/1.8/julia-1.8.2-linux-x86_64.tar.gz
@@ -158,12 +172,15 @@ jobs:
     - name: make julia
       run: |
         PATH="$PATH:$PWD/julia-1.8.2/bin" make julia
+
   test_lua:
     name: "Test: Lua"
     runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: lua install
       run: |
         sudo apt install luajit
@@ -176,6 +193,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: perl install
       run: |
         sudo apt install perl
@@ -190,6 +209,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - uses: r-lib/actions/setup-r@v2
     - name: make r
       run: make r
@@ -199,6 +220,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: ruby install
       run: |
         sudo apt install ruby-full
@@ -210,6 +233,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
@@ -226,6 +251,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: Setup Rust
       run: |
         curl https://sh.rustup.rs -sSf | sh -s -- -y

.github/workflows/test_packages.yml

@@ -12,6 +12,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
@@ -50,6 +52,8 @@ jobs:
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: Build
         run: make all
       - name: Test

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/grammar/external/pcg-c"]
+	path = src/grammar/external/pcg-c
+	url = https://github.com/imneme/pcg-c.git

Makefile

@@ -1,12 +1,16 @@
 CODEDIRS=./src/grammar ./src/grammar/rolls ./src/grammar/util ./src/grammar/operations ./src/grammar/external  
-INCDIRS=./src/grammar
+INCDIRS=./src/grammar ./src/grammar/external/pcg-c/include
 
-CC=cc
+PCG_SRC=./src/grammar/external/pcg-c/src
+
+$(info CC is $(CC))
 
 ifeq ($(CC),g++)
    STANDARD= -std=c++11
 else ifeq ($(CC),clang++)
    STANDARD= -std=c++11
+else ifeq ($(filter $(CC),gcc cc),gcc cc)
+   STANDARD= -std=c99 
 else
    STANDARD= -std=c99
 endif
@@ -25,8 +29,8 @@ ifneq ($(shell uname -s), Darwin)
   OPT := $(OPT) -Wl,-z,nodlopen -Wl,-z,noexecstack \
   -Wl,-z,relro
 endif
-        
-# -ffast-math # Problematic for Python 
+
+# -ffast-math # Problematic for Python
 
 # YACC/LEX fails for the following, so disabled:
 # -Wswitch-default  -Wstrict-overflow=5
@@ -91,16 +95,16 @@ ifeq ($(LEX_FALLBACK), 1)
 LEXER:=lex
 else
 #$(shell echo USING FLEX)
-LEXER:=flex -f -Ca -Ce -Cr 
+LEXER:=flex -f -Ca -Ce -Cr
 endif
 
 # add flags and the include paths
 DEFS=-DUSE_SECURE_RANDOM=${USE_SECURE_RANDOM} -DJUST_YACC=${YACC_FALLBACK} -DUSE_CLT=${USE_CLT}
 
-CFLAGS=$(foreach D,$(INCDIRS),-I$(D)) $(OPT) $(DEFS) 
+CFLAGS=$(foreach D,$(INCDIRS),-I$(D)) $(OPT) $(DEFS)
 
 # add flags to build for shared library and add include paths
-SHAREDCFLAGS=-fPIC -c $(foreach D,$(INCDIRS),-I$(D)) $(ARC4RANDOM) $(DEFS) 
+SHAREDCFLAGS=-fPIC -c $(foreach D,$(INCDIRS),-I$(D)) $(ARC4RANDOM) $(DEFS)
 
 # generate list of c files and remove y.tab.c from src/grammar directory
 CFILES=$(foreach D,$(CODEDIRS),$(wildcard $(D)/*.c)) build/lex.yy.c build/y.tab.c
@@ -127,7 +131,7 @@ install: all
 yacc:
 	mkdir -p build
 	$(foreach BD,$(CFILE_SUBDIRS),mkdir -p build/$(BD))
-	$(PARSER) -d src/grammar/dice.yacc $(PARSER_DEBUG) 
+	$(PARSER) -d src/grammar/dice.yacc $(PARSER_DEBUG)
 	mv y.tab.c build/y.tab.c
 	mv y.tab.h build/y.tab.h
 	mv y.output build/y.output | true	# Only present with verbose
@@ -136,29 +140,33 @@ lex:
 	mv lex.yy.c build/lex.yy.c
 
 # Executable
-compile:
+compile: pcg
 	# FLEX creates warning when run with -f
         # MacOS creates warnings for signs.
 	$(CC) $(CFLAGS) $(CFILES) $(ARC4RANDOM) \
            -Wno-error=implicit-function-declaration \
            -Wno-sign-conversion -Wno-sign-compare -lm \
-           -Wno-implicit-int-conversion
+           -Wno-implicit-int-conversion -lpcg_random -L$(PCG_SRC)  \
+	   -Wno-undef -Wno-conversion	# For pcg-c
 
+# PCG Submodule
+pcg:
+	make -C src/grammar/external/pcg-c all
 
 # Shared Lib
 shared: $(OBJECTS)
-	$(CC) -shared -o build/dice.so $^ $(ARC4RANDOM) -lm
+	$(CC) -shared -o build/dice.so $^ $(ARC4RANDOM) -lm -lpcg_random -L$(PCG_SRC) 
 	cp build/dice.so build/libdice.so
 # Linux
 	mv ./a.out build/dice | true
 # Windows
 	mv ./a.exe build/dice | true
 
 # hardcode for lex and yacc files
-build/y.tab.o: 
+build/y.tab.o:
 	$(CC) $(SHAREDCFLAGS) -c build/y.tab.c -o $@
 build/lex.yy.o:
-	$(CC) $(SHAREDCFLAGS) -c build/lex.yy.c -o $@  
+	$(CC) $(SHAREDCFLAGS) -c build/lex.yy.c -o $@
 
 # Wildcard everything else
 build/*/%.o:src/grammar/*/%.c

src/R/target.mk

@@ -2,5 +2,5 @@
 
 r: clean yacc lex compile $(OBJECTS)
 	mkdir -p build/r/
-	$(CC) -shared -o build/r/dice.so $(OBJECTS) $(ARC4RANDOM) -lR
+	$(CC) -shared -o build/r/dice.so $(OBJECTS) $(ARC4RANDOM) -lR  -lpcg_random -L$(PCG_SRC) 
 	Rscript src/R/main.r

src/grammar/constructs/roll_parameters.h

@@ -4,11 +4,11 @@
 #include "constructs/dice_enums.h"
 
 typedef struct roll_params {
-  unsigned int number_of_dice;
-  unsigned int die_sides;
+  unsigned long long number_of_dice;
+  unsigned long long die_sides;
   EXPLOSION_TYPE explode;
   char** symbol_pool;
-  int start_value;
+  long long start_value;
   DIE_TYPE dtype;
 } roll_params;
 

src/grammar/constructs/vec.h

@@ -7,11 +7,13 @@
 
 typedef struct vec {
   DIE_TYPE dtype;
+
   union { // Vectors can only contain one dice type
-    int* content;
+    long long* content;
     char** symbols;
   } storage;
-  unsigned int length;
+  unsigned long long length;
+
   roll_params source;
   bool has_source;
 } vec;