From dbdbfe947328a51d954b971171426b101da64012 Mon Sep 17 00:00:00 2001 From: Konstantinos Margaritis Date: Tue, 21 Mar 2023 18:07:06 +0000 Subject: [PATCH] Set Ragel.rl char type to unsigned, #135 --- cmake/ragel.cmake | 2 +- src/hs.h | 2 +- src/parser/Parser.rl | 1 + src/parser/control_verbs.rl | 1 + tools/hscollider/ColliderCorporaParser.rl | 1 + util/ExpressionParser.rl | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/ragel.cmake b/cmake/ragel.cmake index d3f0b926..f33a96a1 100644 --- a/cmake/ragel.cmake +++ b/cmake/ragel.cmake @@ -7,7 +7,7 @@ function(ragelmaker src_rl) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${src_dir}/${src_file}.cpp COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${src_dir} - COMMAND ${RAGEL} ${CMAKE_CURRENT_SOURCE_DIR}/${src_rl} -o ${rl_out} + COMMAND ${RAGEL} ${CMAKE_CURRENT_SOURCE_DIR}/${src_rl} -o ${rl_out -G0} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${src_rl} ) add_custom_target(ragel_${src_file} DEPENDS ${rl_out}) diff --git a/src/hs.h b/src/hs.h index 2fe5d248..cdc1ffbc 100644 --- a/src/hs.h +++ b/src/hs.h @@ -43,7 +43,7 @@ #define HS_MAJOR 5 #define HS_MINOR 4 -#define HS_PATCH 0 +#define HS_PATCH 9 #include "hs_compile.h" #include "hs_runtime.h" diff --git a/src/parser/Parser.rl b/src/parser/Parser.rl index 0fa76aca..b2006501 100644 --- a/src/parser/Parser.rl +++ b/src/parser/Parser.rl @@ -272,6 +272,7 @@ unichar readUtf8CodePoint4c(const char *s) { %%{ machine regex; + alphtype unsigned char; action throwUnsupportedEscape { ostringstream str; diff --git a/src/parser/control_verbs.rl b/src/parser/control_verbs.rl index 1d3e33a9..09b0bfd7 100644 --- a/src/parser/control_verbs.rl +++ b/src/parser/control_verbs.rl @@ -54,6 +54,7 @@ const char *read_control_verbs(const char *ptr, const char *end, size_t start, %%{ machine ControlVerbs; + alphtype unsigned char; # Verbs that we recognise but do not support. unhandledVerbs = '(*' ( diff --git a/tools/hscollider/ColliderCorporaParser.rl b/tools/hscollider/ColliderCorporaParser.rl index ab40b2ba..04e8f6fe 100644 --- a/tools/hscollider/ColliderCorporaParser.rl +++ b/tools/hscollider/ColliderCorporaParser.rl @@ -57,6 +57,7 @@ char unhex(const char *start, UNUSED const char *end) { %%{ machine FileCorporaParser; + alphtype unsigned char; action accumulateNum { num = (num * 10) + (fc - '0'); diff --git a/util/ExpressionParser.rl b/util/ExpressionParser.rl index fec47922..b93f069d 100644 --- a/util/ExpressionParser.rl +++ b/util/ExpressionParser.rl @@ -55,6 +55,7 @@ enum ParamKey { %%{ machine ExpressionParser; + alphtype unsigned char; action accumulateNum { num = (num * 10) + (fc - '0');