From f8db6dc1466825334cf4d66ca12ec37a7bca5099 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Fri, 17 Nov 2023 14:07:39 +0000 Subject: [PATCH 01/26] Update GNOLL.ini Signed-off-by: Ian Hunter --- GNOLL.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNOLL.ini b/GNOLL.ini index 1d7db1ebf..ca3882b9a 100644 --- a/GNOLL.ini +++ b/GNOLL.ini @@ -1,4 +1,4 @@ ; Placeholder file for future configuration setting. Currently unused [Meta Information] -version = v3.2.0 +version = v3.4.0 ttrpg_compatibility_rate = 98.66 From 0031f34c2687e3ae09b3100b7218d1889deea62d Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Fri, 17 Nov 2023 14:10:48 +0000 Subject: [PATCH 02/26] Update setup.cfg Signed-off-by: Ian Hunter --- src/python/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/setup.cfg b/src/python/setup.cfg index 1e6ae1700..03a37aa4e 100644 --- a/src/python/setup.cfg +++ b/src/python/setup.cfg @@ -2,7 +2,7 @@ name = gnoll author = Ian Frederick Vigogne Goodbody Hunter author_email = ianfhunter@gmail.com -version = 4.3.4 +version = 4.4.0 description = An efficient dice notation parser with extended notation long_description = file: README.md long_description_content_type = text/markdown From b328971508cba83d579ef14388640fb169c21797 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Fri, 17 Nov 2023 14:11:49 +0000 Subject: [PATCH 03/26] Update Project.toml Signed-off-by: Ian Hunter --- src/julia/GNOLL/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/julia/GNOLL/Project.toml b/src/julia/GNOLL/Project.toml index f96c9f0bf..d2def8c20 100644 --- a/src/julia/GNOLL/Project.toml +++ b/src/julia/GNOLL/Project.toml @@ -1,7 +1,7 @@ name = "GnollDiceNotation" uuid = "6d20aa67-345f-4b27-9ab4-1a86910b1003" authors = ["Ian-Hunter"] -version = "4.3.0" +version = "4.4.0" [deps] Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" From a8d098928a6af9da5544cdd78121807acf9e3d44 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 08:59:32 +0000 Subject: [PATCH 04/26] Update GNOLL.ini Signed-off-by: Ian Hunter --- GNOLL.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNOLL.ini b/GNOLL.ini index ca3882b9a..9e6688cf2 100644 --- a/GNOLL.ini +++ b/GNOLL.ini @@ -1,4 +1,4 @@ ; Placeholder file for future configuration setting. Currently unused [Meta Information] -version = v3.4.0 +version = v4.4.0 ttrpg_compatibility_rate = 98.66 From f429a8c1c8f595dacba3c58b2aa0b8a6ca1769f0 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 09:17:07 +0000 Subject: [PATCH 05/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index b3e0b9cc1..ab5d6b8b7 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -126,7 +126,9 @@ jobs: - name: javascript prerequisites run: | sudo apt install clang-14 lld-14 llvm-14 nodejs libjs-d3 python3-numpy - sudo apt install nodejs llvm -y + sudo apt install llvm -y + curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - + sudo apt-get install -y nodejs wget -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb sudo apt install ./emscripten_3.1.6~dfsg-5_all.deb - name: make js From ce35993dc06986a0130559283bf3db4fdce432b7 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 09:22:33 +0000 Subject: [PATCH 06/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index ab5d6b8b7..30d5514f1 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -125,7 +125,7 @@ jobs: run: python3 -m pip install -r reqs/requirements.txt - name: javascript prerequisites run: | - sudo apt install clang-14 lld-14 llvm-14 nodejs libjs-d3 python3-numpy + sudo apt install clang-14 lld-14 llvm-14 libjs-d3 python3-numpy sudo apt install llvm -y curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - sudo apt-get install -y nodejs From d386819fd20aa403911abfb6b358d37ae8beca70 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 09:29:16 +0000 Subject: [PATCH 07/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index 30d5514f1..e4fca83b0 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -127,7 +127,7 @@ jobs: run: | sudo apt install clang-14 lld-14 llvm-14 libjs-d3 python3-numpy sudo apt install llvm -y - curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - + curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash - sudo apt-get install -y nodejs wget -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb sudo apt install ./emscripten_3.1.6~dfsg-5_all.deb From c56c98e03dc8583b64df2d28734166a191e209e8 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 09:51:48 +0000 Subject: [PATCH 08/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index e4fca83b0..281f32ae6 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -129,8 +129,8 @@ jobs: sudo apt install llvm -y curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash - sudo apt-get install -y nodejs - wget -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb - sudo apt install ./emscripten_3.1.6~dfsg-5_all.deb + wget --no-verbose -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb + sudo apt install ./emscripten_3.1.6~dfsg-5_all.deb nodejs- # ignore nodejs acorn max version - name: make js run: | emcc -v From 047d85e0671da092708cb46478bbcbf9648eab15 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 09:59:37 +0000 Subject: [PATCH 09/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index 281f32ae6..82b12473c 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -123,12 +123,19 @@ jobs: version: "10.0" - name: python deps run: python3 -m pip install -r reqs/requirements.txt - - name: javascript prerequisites + - name: apt prerequisites run: | sudo apt install clang-14 lld-14 llvm-14 libjs-d3 python3-numpy sudo apt install llvm -y + - name: javascript prerequisites + run: | + # NodeJS curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash - sudo apt-get install -y nodejs + # Acorn-Node + git clone https://github.com/acornjs/acorn.git + cd acorn ; npm install ; cd - + # Emscripten wget --no-verbose -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb sudo apt install ./emscripten_3.1.6~dfsg-5_all.deb nodejs- # ignore nodejs acorn max version - name: make js From f9e0dcc553fcf5ef6abdc504ef9f3da1df5c25a2 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 10:08:42 +0000 Subject: [PATCH 10/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index 82b12473c..d804f18b6 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -137,7 +137,7 @@ jobs: cd acorn ; npm install ; cd - # Emscripten wget --no-verbose -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb - sudo apt install ./emscripten_3.1.6~dfsg-5_all.deb nodejs- # ignore nodejs acorn max version + sudo apt install ./emscripten_3.1.6~dfsg-5_all.deb nodejs- node-acorn- # ignore nodejs acorn max version - name: make js run: | emcc -v From d01e85dbc38c59bb2bb257cb376e5f3baea038de Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 10:18:55 +0000 Subject: [PATCH 11/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index d804f18b6..dc1ee98b7 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -137,7 +137,7 @@ jobs: cd acorn ; npm install ; cd - # Emscripten wget --no-verbose -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb - sudo apt install ./emscripten_3.1.6~dfsg-5_all.deb nodejs- node-acorn- # ignore nodejs acorn max version + sudo apt install -f ./emscripten_3.1.6~dfsg-5_all.deb nodejs- node-acorn- # ignore nodejs acorn max version - name: make js run: | emcc -v From eb06ae76fb2bca65a17aadb472dd9e712be8e7fb Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 10:31:25 +0000 Subject: [PATCH 12/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index dc1ee98b7..009f9c4d6 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -82,14 +82,8 @@ jobs: run: | sudo apt update sudo apt install cabal-install haskell-stack ghc - # curl -O https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-deb10-linux.tar.xz - # tar xvf ghc-8.10.7-x86_64-deb10-linux.tar.xz - # cd ghc-8.10.7 && ./configure - # cd ghc-8.10.7 && make install ghc --version cabal update - # stack init - # stack --resolver lts-18 build - name: make haskell run: | make haskell @@ -136,8 +130,10 @@ jobs: git clone https://github.com/acornjs/acorn.git cd acorn ; npm install ; cd - # Emscripten - wget --no-verbose -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb - sudo apt install -f ./emscripten_3.1.6~dfsg-5_all.deb nodejs- node-acorn- # ignore nodejs acorn max version + git clone https://github.com/emscripten-core/emsdk.git + cd emsdk ; ./emsdk install latest : ./emsdk activate latest ; source ./emsdk_env.sh ; cd - + # wget --no-verbose -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb + # sudo apt install -f ./emscripten_3.1.6~dfsg-5_all.deb nodejs- node-acorn- # ignore nodejs acorn max version - name: make js run: | emcc -v From 12819f822db144176f51f638e2697b7c3f7590c4 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 10:40:37 +0000 Subject: [PATCH 13/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index 009f9c4d6..ac59f8117 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -131,7 +131,7 @@ jobs: cd acorn ; npm install ; cd - # Emscripten git clone https://github.com/emscripten-core/emsdk.git - cd emsdk ; ./emsdk install latest : ./emsdk activate latest ; source ./emsdk_env.sh ; cd - + cd emsdk ; ./emsdk install latest ; ./emsdk activate latest ; source ./emsdk_env.sh ; cd - # wget --no-verbose -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb # sudo apt install -f ./emscripten_3.1.6~dfsg-5_all.deb nodejs- node-acorn- # ignore nodejs acorn max version - name: make js From a2a26ed734dfd580bd0dd9be91f246cf5531cb61 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 10:50:38 +0000 Subject: [PATCH 14/26] Update test_language_bindings.yml Signed-off-by: Ian Hunter --- .github/workflows/test_language_bindings.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_language_bindings.yml b/.github/workflows/test_language_bindings.yml index ac59f8117..7dc871222 100644 --- a/.github/workflows/test_language_bindings.yml +++ b/.github/workflows/test_language_bindings.yml @@ -131,11 +131,12 @@ jobs: cd acorn ; npm install ; cd - # Emscripten git clone https://github.com/emscripten-core/emsdk.git - cd emsdk ; ./emsdk install latest ; ./emsdk activate latest ; source ./emsdk_env.sh ; cd - + cd emsdk ; ./emsdk install latest ; cd - # wget --no-verbose -c http://archive.ubuntu.com/ubuntu/pool/universe/e/emscripten/emscripten_3.1.6~dfsg-5_all.deb # sudo apt install -f ./emscripten_3.1.6~dfsg-5_all.deb nodejs- node-acorn- # ignore nodejs acorn max version - name: make js run: | + cd emsdk ; ./emsdk activate latest ; source ./emsdk_env.sh ; cd - emcc -v make js node ./build/js/a.out.js 1d20 From 4dfea7f8ec7d65a2db54a9b0c4f787fc8b54a667 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:04:40 +0000 Subject: [PATCH 15/26] Update mocking.h Signed-off-by: Ian Hunter --- src/grammar/util/mocking.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/grammar/util/mocking.h b/src/grammar/util/mocking.h index f9e80c79e..b10919a00 100644 --- a/src/grammar/util/mocking.h +++ b/src/grammar/util/mocking.h @@ -1,3 +1,5 @@ +#ifndef __MOCKING_H__ +#define __MOCKING_H__ #include "constructs/dice_enums.h" #include "shared_header.h" @@ -15,3 +17,5 @@ typedef enum { void reset_mocking(); void init_mocking(MOCK_METHOD mock_style, int starting_value); void mocking_tick(); + +#endif From 01e5aa5e9eab2e90e97753a663b7c736c25f254b Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:07:04 +0000 Subject: [PATCH 16/26] Update safe_functions.h Signed-off-by: Ian Hunter --- src/grammar/util/safe_functions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grammar/util/safe_functions.h b/src/grammar/util/safe_functions.h index b967e5874..7fef7cfe8 100644 --- a/src/grammar/util/safe_functions.h +++ b/src/grammar/util/safe_functions.h @@ -22,7 +22,7 @@ typedef enum { UNDEFINED_MACRO = 12 } ERROR_CODES; -void print_gnoll_errors(); +void print_gnoll_errors(void); void *safe_malloc(size_t size); void *safe_calloc(size_t nitems, size_t size); FILE *safe_fopen(const char *filename, const char *mode); From 8e6e729d4de620f8dd815be45fd9672ed412fdca Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:07:30 +0000 Subject: [PATCH 17/26] Update mocking.h Signed-off-by: Ian Hunter --- src/grammar/util/mocking.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/grammar/util/mocking.h b/src/grammar/util/mocking.h index b10919a00..6f1b93f1b 100644 --- a/src/grammar/util/mocking.h +++ b/src/grammar/util/mocking.h @@ -14,8 +14,8 @@ typedef enum { } MOCK_METHOD; // Mocking Util -void reset_mocking(); +void reset_mocking(void); void init_mocking(MOCK_METHOD mock_style, int starting_value); -void mocking_tick(); +void mocking_tick(void); #endif From 30fe5ff21ecc6b4211d0105276981e6b8736e675 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:08:11 +0000 Subject: [PATCH 18/26] Update mocking.c Signed-off-by: Ian Hunter --- src/grammar/util/mocking.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/grammar/util/mocking.c b/src/grammar/util/mocking.c index 5103de908..05d09d132 100644 --- a/src/grammar/util/mocking.c +++ b/src/grammar/util/mocking.c @@ -6,7 +6,7 @@ int secondary_mock_value = 0; MOCK_METHOD global_mock_style = NO_MOCK; -void reset_mocking() { +void reset_mocking(void) { /** * @brief Resets various globals for test mocking */ @@ -26,7 +26,7 @@ void init_mocking(MOCK_METHOD mock_style, int starting_value) { global_mock_style = mock_style; } -void mocking_tick() { +void mocking_tick(void) { /** * @brief Every time a dice is rolled, this function is called so that the * mocking logic can update From c2703e704bf22827c2fdaead684ddb721960ad72 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:08:35 +0000 Subject: [PATCH 19/26] Update safe_functions.c Signed-off-by: Ian Hunter --- src/grammar/util/safe_functions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grammar/util/safe_functions.c b/src/grammar/util/safe_functions.c index f82584825..1d8feb972 100644 --- a/src/grammar/util/safe_functions.c +++ b/src/grammar/util/safe_functions.c @@ -17,7 +17,7 @@ extern int verbose; #define ANSI_COLOR_RESET "\x1b[0m" -void print_gnoll_errors(){ +void print_gnoll_errors(void){ /** * @brief A human-readable translation of the gnoll error codes * From 570f51c59d78d8870184fc0079e4cc62abc98318 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:09:04 +0000 Subject: [PATCH 20/26] Update randomness.h Signed-off-by: Ian Hunter --- src/grammar/rolls/randomness.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grammar/rolls/randomness.h b/src/grammar/rolls/randomness.h index f5107e9db..0bf8a3854 100644 --- a/src/grammar/rolls/randomness.h +++ b/src/grammar/rolls/randomness.h @@ -1,7 +1,7 @@ #ifndef __RANDOMNESS_H__ #define __RANDOMNESS_H__ -int get_random_uniformly(); +int get_random_uniformly(void); double get_random_normally(double mean, double std); #endif From a8b2c3bafc6df00b5c42f5e0c3a3de97ac942c32 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:09:17 +0000 Subject: [PATCH 21/26] Update randomness.c Signed-off-by: Ian Hunter --- src/grammar/rolls/randomness.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grammar/rolls/randomness.c b/src/grammar/rolls/randomness.c index 2ac009bd8..ae411f6ff 100644 --- a/src/grammar/rolls/randomness.c +++ b/src/grammar/rolls/randomness.c @@ -11,7 +11,7 @@ extern pcg32_random_t rng; -int get_random_uniformly(){ +int get_random_uniformly(void){ int value; #if USE_SECURE_RANDOM == 1 value = (int)arc4random_uniform(INT_MAX); From 7906c51b23416d56eb2f98f8a2957b3d16d52e0a Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:30:50 +0000 Subject: [PATCH 22/26] Update macros.c Signed-off-by: Ian Hunter --- src/grammar/operations/macros.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grammar/operations/macros.c b/src/grammar/operations/macros.c index 11b5d509c..18e8bb905 100644 --- a/src/grammar/operations/macros.c +++ b/src/grammar/operations/macros.c @@ -31,7 +31,7 @@ unsigned long hash_function(unsigned char *str) { return hash; } -void delete_all_macros() { +void delete_all_macros(void) { struct macro_struct *current_macro, *tmp; HASH_ITER(hh, macros, current_macro, tmp) { From 0430832e91e866a28316554d554e7aaa804c5731 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:31:05 +0000 Subject: [PATCH 23/26] Update macros.h Signed-off-by: Ian Hunter --- src/grammar/operations/macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grammar/operations/macros.h b/src/grammar/operations/macros.h index f09c3d12b..97a6138d7 100644 --- a/src/grammar/operations/macros.h +++ b/src/grammar/operations/macros.h @@ -14,7 +14,7 @@ struct macro_struct { UT_hash_handle hh; /* makes this structure hashable */ }; -void delete_all_macros(); +void delete_all_macros(void); void register_macro(vec *macro_name, roll_params *to_store); From 2765bdba2d662ed5ed8febf403a0af69a18de2ff Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:41:10 +0000 Subject: [PATCH 24/26] Update pcg_basic.c Signed-off-by: Ian Hunter --- src/grammar/external/pcg_basic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grammar/external/pcg_basic.c b/src/grammar/external/pcg_basic.c index 211a6e586..cba5bb68e 100644 --- a/src/grammar/external/pcg_basic.c +++ b/src/grammar/external/pcg_basic.c @@ -64,7 +64,7 @@ uint32_t pcg32_random_r(pcg32_random_t* rng) { return (xorshifted >> rot) | (xorshifted << ((-rot) & 31)); } -uint32_t pcg32_random() { return pcg32_random_r(&pcg32_global); } +uint32_t pcg32_random(void) { return pcg32_random_r(&pcg32_global); } // pcg32_boundedrand(bound): // pcg32_boundedrand_r(rng, bound): From 6043e430a7701aad7745334f9e569ec0bfecb1e1 Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:52:38 +0000 Subject: [PATCH 25/26] Update dice.yacc Signed-off-by: Ian Hunter --- src/grammar/dice.yacc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/grammar/dice.yacc b/src/grammar/dice.yacc index d677d025a..7d5f6a2b9 100644 --- a/src/grammar/dice.yacc +++ b/src/grammar/dice.yacc @@ -31,7 +31,7 @@ int yylex(void); int yyerror(const char* s); -int yywrap(); +int yywrap(void); //TODO: move to external file @@ -50,10 +50,10 @@ extern struct macro_struct *macros; pcg32_random_t rng; // Function Signatures for this file -int initialize(); +int initialize(void); // Functions -int initialize(){ +int initialize(void){ if (!seeded){ unsigned long int tick = (unsigned long)time(0)+(unsigned long)clock(); pcg32_srandom_r( @@ -1809,7 +1809,7 @@ const char *s; } -int yywrap(){ +int yywrap(void){ return (1); } From cab7000e25a51ca93ed9576f4ef92471ee279e9d Mon Sep 17 00:00:00 2001 From: Ian Hunter Date: Sat, 25 Nov 2023 11:55:12 +0000 Subject: [PATCH 26/26] Update dice.yacc Signed-off-by: Ian Hunter --- src/grammar/dice.yacc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/grammar/dice.yacc b/src/grammar/dice.yacc index 7d5f6a2b9..76c1dac3e 100644 --- a/src/grammar/dice.yacc +++ b/src/grammar/dice.yacc @@ -1794,8 +1794,7 @@ int main(int argc, char **str){ free(macros); } -int yyerror(s) -const char *s; +int yyerror(const char *s) { fprintf(stderr, "%s\n", s);