From a245d2573895682098791f729c2f83376fcfa45a Mon Sep 17 00:00:00 2001 From: Emil Date: Sun, 27 Aug 2023 01:31:36 -0600 Subject: [PATCH] Something something build system --- Makefile | 2 +- chad.mk | 2 ++ config.mk | 9 ++++----- source/regex.c | 7 +------ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 72dd5b6..c698c95 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ ${TARGET}: ${HDR} | ${OBJ} ${SRC} ${HDR}: install: ${PREFIX} - install -v -g ${USER} -o ${USER} -m 744 ${TARGET} ${PREFIX}/bin/ + install -v -g ${USER} -o ${USER} -m 744 ${TARGET} ${PREFIX}/ uninstall: -rm ${PREFIX}/bin/${TARGET} diff --git a/chad.mk b/chad.mk index fc51c38..c4ce45a 100644 --- a/chad.mk +++ b/chad.mk @@ -1,3 +1,5 @@ +# - ARGS : default flags to test the program with + # Programs to check warnings for as defined by the chad standard ARGS:=${TARGET} < source/main.c diff --git a/config.mk b/config.mk index 517dfe6..0a3f5c1 100644 --- a/config.mk +++ b/config.mk @@ -1,9 +1,6 @@ -# Make script for Chad projects -# This script depends on the following variables # - TARGET : output program name -# - ARGS : default flags to fork ${OUT} with -PREFIX:=/usr/bin +TARGET:=hl CFLAGS:=-std=c99 CPPFLAGS:=-Isyntax/ -D_GNU_SOURCE -D_FORTIFY_SOURCE=2 @@ -16,4 +13,6 @@ else CFLAGS += -O2 -flto=auto endif -TARGET:=hl +PREFIX:=/usr/bin + +USER=$(shell whoami) diff --git a/source/regex.c b/source/regex.c index 6dea9eb..2911af7 100644 --- a/source/regex.c +++ b/source/regex.c @@ -444,7 +444,6 @@ int regex_free(regex_t * const regex) { // ----------------- static bool catch_(const regex_t * const regex, int * const state) { - for (size_t i = 0; i < regex->catch_table.element_count; i++){ const offshoot_t * const offshoot = *(offshoot_t**)vector_get(®ex->catch_table, i); if (offshoot->in == *state) { @@ -458,8 +457,7 @@ static bool catch_(const regex_t * const regex, static int regex_assert(const regex_t * const regex, const char * const string, int state, - int * width) { - + int * width) { for (const char * s = string; *s != '\00'; s++) { // delta for (size_t i = 0; i < regex->delta_table.element_count; i++) { @@ -484,7 +482,6 @@ static int regex_assert(const regex_t * const regex, int regex_match( regex_t * regex, const char * const string) { - if (regex == NULL) { return false; } @@ -498,7 +495,5 @@ int regex_match( regex_t * regex, bool regex_search( regex_t * regex, const char * const string) { - return (bool)regex_match(regex, string, 0); } -