From 609c1f06046dfd23f698f8e362869e8b5526b764 Mon Sep 17 00:00:00 2001 From: Tobias Jordan Date: Sun, 10 Aug 2025 11:41:59 +0000 Subject: [PATCH 1/6] some newlines --- src/SQLParser.h | 2 +- src/SQLParserResult.h | 2 +- src/parser/parser_typedef.h | 2 +- src/sql/DropStatement.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SQLParser.h b/src/SQLParser.h index 6e783a17..707ba8ea 100644 --- a/src/SQLParser.h +++ b/src/SQLParser.h @@ -32,4 +32,4 @@ class SQLParser { } // namespace hsql -#endif \ No newline at end of file +#endif diff --git a/src/SQLParserResult.h b/src/SQLParserResult.h index e8329b5e..c33bc3d0 100644 --- a/src/SQLParserResult.h +++ b/src/SQLParserResult.h @@ -91,4 +91,4 @@ class SQLParserResult { } // namespace hsql -#endif // SQLPARSER_SQLPARSER_RESULT_H \ No newline at end of file +#endif // SQLPARSER_SQLPARSER_RESULT_H diff --git a/src/parser/parser_typedef.h b/src/parser/parser_typedef.h index 329235b1..61afef4a 100644 --- a/src/parser/parser_typedef.h +++ b/src/parser/parser_typedef.h @@ -30,4 +30,4 @@ struct HSQL_CUST_LTYPE { #define HSQL_LTYPE HSQL_CUST_LTYPE #define HSQL_LTYPE_IS_DECLARED 1 -#endif \ No newline at end of file +#endif diff --git a/src/sql/DropStatement.h b/src/sql/DropStatement.h index 63b7a2bf..bdb4db7b 100755 --- a/src/sql/DropStatement.h +++ b/src/sql/DropStatement.h @@ -22,4 +22,4 @@ struct DropStatement : SQLStatement { }; } // namespace hsql -#endif \ No newline at end of file +#endif From 5ade3915c6ea50623a153b6c6644c60a9cc341fa Mon Sep 17 00:00:00 2001 From: Tobias Jordan Date: Sun, 10 Aug 2025 13:54:37 +0000 Subject: [PATCH 2/6] enable -Wnewline-eof if clang is used --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1a27fa77..3dac9157 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,9 @@ ifeq ($(relaxed_build), on) $(warning $(NAME) will be built with most compiler warnings deactivated. This is fine if you want to test $(NAME) but will become an issue when you want to contribute code.) else LIB_CFLAGS += -Wall -Werror + ifneq (,$(findstring clang,$(shell $(CXX) --version 2>/dev/null))) + LIB_CFLAGS += -Wnewline-eof + endif endif static ?= no @@ -104,7 +107,7 @@ install: ####################################### ############## Benchmark ############## -####################################### +######################################## BM_BUILD = $(BIN)/benchmark BM_CFLAGS = -std=c++17 -Wall -Isrc/ -L./ $(OPT_FLAG) BM_PATH = benchmark From bb5f1ee5f7be4b71388a1e7f33d9be162885946a Mon Sep 17 00:00:00 2001 From: Tobias Jordan Date: Sun, 10 Aug 2025 13:54:44 +0000 Subject: [PATCH 3/6] test if CI fails --- src/parser/parser_typedef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parser/parser_typedef.h b/src/parser/parser_typedef.h index 61afef4a..329235b1 100644 --- a/src/parser/parser_typedef.h +++ b/src/parser/parser_typedef.h @@ -30,4 +30,4 @@ struct HSQL_CUST_LTYPE { #define HSQL_LTYPE HSQL_CUST_LTYPE #define HSQL_LTYPE_IS_DECLARED 1 -#endif +#endif \ No newline at end of file From 6e0ec3f3fefd4a82f9fe5eb60cb636063584a622 Mon Sep 17 00:00:00 2001 From: Tobias Jordan Date: Sun, 10 Aug 2025 13:59:31 +0000 Subject: [PATCH 4/6] nice --- src/parser/parser_typedef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parser/parser_typedef.h b/src/parser/parser_typedef.h index 329235b1..61afef4a 100644 --- a/src/parser/parser_typedef.h +++ b/src/parser/parser_typedef.h @@ -30,4 +30,4 @@ struct HSQL_CUST_LTYPE { #define HSQL_LTYPE HSQL_CUST_LTYPE #define HSQL_LTYPE_IS_DECLARED 1 -#endif \ No newline at end of file +#endif From d38419338df757f44f48e63c4cbfd69ac68abeee Mon Sep 17 00:00:00 2001 From: Tobias Jordan Date: Sun, 10 Aug 2025 15:00:19 +0000 Subject: [PATCH 5/6] oops --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3dac9157..4bb0fdc9 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ install: ####################################### ############## Benchmark ############## -######################################## +####################################### BM_BUILD = $(BIN)/benchmark BM_CFLAGS = -std=c++17 -Wall -Isrc/ -L./ $(OPT_FLAG) BM_PATH = benchmark From 840223a87d53ad0558ec337df77f20efffb3a780 Mon Sep 17 00:00:00 2001 From: Tobias Jordan Date: Mon, 11 Aug 2025 14:29:15 +0000 Subject: [PATCH 6/6] added comment --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 4bb0fdc9..4b036045 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,8 @@ ifeq ($(relaxed_build), on) $(warning $(NAME) will be built with most compiler warnings deactivated. This is fine if you want to test $(NAME) but will become an issue when you want to contribute code.) else LIB_CFLAGS += -Wall -Werror + # Clang: ensure files end with newline. Missing final newlines here triggered + # -Wnewline-eof warnings in downstream projects (e.g., Hyrise). ifneq (,$(findstring clang,$(shell $(CXX) --version 2>/dev/null))) LIB_CFLAGS += -Wnewline-eof endif