From 85bbd315c9774fde59cb0724e990b8ff76b2a1a5 Mon Sep 17 00:00:00 2001
From: picomeg <megordon5@gmail.com>
Date: Fri, 26 Mar 2021 04:31:38 +0000
Subject: [PATCH] Move typedefs for parser for backend by name over to header
file
---
src/hammer.c | 34 ----------------------------------
src/hammer.h | 33 +++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/hammer.c b/src/hammer.c
index 92e49302..6084da40 100644
--- a/src/hammer.c
+++ b/src/hammer.c
@@ -43,40 +43,6 @@ typedef struct {
const HParser *p2;
} HTwoParsers;
-/*
- * For parser used when extracting name and params for backend by name
- * TODO: move to its own file?
- * (tried to move it to hammer.h but no luck compiling - what did I do wrong?)
- */
-
-enum BackendTokenType_ {
- TT_backend_with_params_t = TT_USER,
- TT_backend_name_t,
- TT_backend_param_t,
- TT_backend_params_t
-};
-
-typedef struct backend_param {
- size_t len;
- uint8_t *param;
-} backend_param_t;
-
-typedef struct {
- uint8_t *name;
- size_t len;
-} backend_name_t;
-
-typedef struct backend_params {
- backend_param_t *params;
- size_t len;
-} backend_params_t;
-
-typedef struct backend_with_params {
- backend_name_t name;
- backend_params_t params;
-} backend_with_params_t;
-
-
/* Backend-related inquiries */
int h_is_backend_available(HParserBackend backend) {
diff --git a/src/hammer.h b/src/hammer.h
index be112c3a..8faf9c7a 100644
--- a/src/hammer.h
+++ b/src/hammer.h
@@ -200,6 +200,39 @@ typedef bool (*HPredicate)(HParseResult *p, void* user_data);
*/
typedef HParser* (*HContinuation)(HAllocator *mm__, const HParsedToken *x, void *env);
+/*
+ * For parser used when extracting name and params for backend by name
+ * TODO: possibly move to its own file?
+ */
+
+enum BackendTokenType_ {
+ TT_backend_with_params_t = TT_USER,
+ TT_backend_name_t,
+ TT_backend_param_t,
+ TT_backend_params_t
+};
+
+typedef struct backend_param {
+ size_t len;
+ uint8_t *param;
+} backend_param_t;
+
+typedef struct {
+ uint8_t *name;
+ size_t len;
+} backend_name_t;
+
+typedef struct backend_params {
+ backend_param_t *params;
+ size_t len;
+} backend_params_t;
+
+typedef struct backend_with_params {
+ backend_name_t name;
+ backend_params_t params;
+} backend_with_params_t;
+
+
// {{{ Stuff for benchmarking
typedef struct HParserTestcase_ {
unsigned char* input;
--
GitLab