Translate C lexer tests to C unit tests

This allows us to get rid of a bunch of exports and ctypes wrappers.

Signed-off-by: Omar Sandoval <[email protected]>

Author: osandov

libdrgn/Makefile.am

@@ -45,6 +45,7 @@ libdrgnimpl_la_SOURCES = $(ARCH_DEFS_PYS:_defs.py=.c) \
 			 binary_search_tree.h \
 			 bitops.h \
 			 c_keywords.inc \
+			 c_lexer.h \
 			 cfi.c \
 			 cfi.h \
 			 cityhash.h \
@@ -214,7 +215,8 @@ examples_load_debug_info_LDADD = libdrgnimpl.la
 # Python unit tests instead.
 TESTS = $(check_PROGRAMS)
 
-check_PROGRAMS = tests/lexer
+check_PROGRAMS = tests/language_c \
+		 tests/lexer
 
 EXTRA_DIST += $(addsuffix .c.in,$(check_PROGRAMS))
 
@@ -230,6 +232,9 @@ test_cflags = $(AM_CFLAGS) $(check_CFLAGS)
 test_cppflags = $(AM_CPPFLAGS) -iquote $(srcdir)/tests
 test_ldadd = $(check_LIBS) libdrgnimpl.la
 
+tests_language_c_CFLAGS = $(test_cflags)
+tests_language_c_CPPFLAGS = $(test_cppflags)
+tests_language_c_LDADD = $(test_ldadd)
 tests_lexer_CFLAGS = $(test_cflags)
 tests_lexer_CPPFLAGS = $(test_cppflags)
 tests_lexer_LDADD = $(test_ldadd)

libdrgn/c_lexer.h

@@ -0,0 +1,61 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#ifndef DRGN_C_LEXER_H
+#define DRGN_C_LEXER_H
+
+#include <stdbool.h>
+
+#include "lexer.h"
+
+// These definitions are only exposed for testing purposes.
+
+// This obviously incomplete since we only handle the tokens we care about.
+enum {
+	C_TOKEN_EOF = -1,
+	MIN_KEYWORD_TOKEN,
+	MIN_SPECIFIER_TOKEN = MIN_KEYWORD_TOKEN,
+	C_TOKEN_VOID = MIN_SPECIFIER_TOKEN,
+	C_TOKEN_CHAR,
+	C_TOKEN_SHORT,
+	C_TOKEN_INT,
+	C_TOKEN_LONG,
+	C_TOKEN_SIGNED,
+	C_TOKEN_UNSIGNED,
+	C_TOKEN_BOOL,
+	C_TOKEN_FLOAT,
+	C_TOKEN_DOUBLE,
+	C_TOKEN_COMPLEX,
+	MAX_SPECIFIER_TOKEN = C_TOKEN_COMPLEX,
+	MIN_QUALIFIER_TOKEN,
+	C_TOKEN_CONST = MIN_QUALIFIER_TOKEN,
+	C_TOKEN_RESTRICT,
+	C_TOKEN_VOLATILE,
+	C_TOKEN_ATOMIC,
+	MAX_QUALIFIER_TOKEN = C_TOKEN_ATOMIC,
+	C_TOKEN_STRUCT,
+	C_TOKEN_UNION,
+	C_TOKEN_CLASS,
+	C_TOKEN_ENUM,
+	MAX_KEYWORD_TOKEN = C_TOKEN_ENUM,
+	C_TOKEN_LPAREN,
+	C_TOKEN_RPAREN,
+	C_TOKEN_LBRACKET,
+	C_TOKEN_RBRACKET,
+	C_TOKEN_ASTERISK,
+	C_TOKEN_DOT,
+	C_TOKEN_NUMBER,
+	C_TOKEN_IDENTIFIER,
+	C_TOKEN_TEMPLATE_ARGUMENTS,
+	C_TOKEN_COLON,
+};
+
+struct drgn_c_family_lexer {
+	struct drgn_lexer lexer;
+	bool cpp;
+};
+
+struct drgn_error *drgn_c_family_lexer_func(struct drgn_lexer *lexer,
+					    struct drgn_token *token);
+
+#endif /* DRGN_C_LEXER_H */

libdrgn/language_c.c

@@ -12,6 +12,7 @@
 
 #include "array.h"
 #include "bitops.h"
+#include "c_lexer.h"
 #include "error.h"
 #include "language.h" // IWYU pragma: associated
 #include "lexer.h"
@@ -1611,53 +1612,8 @@ static struct drgn_error *c_format_object(const struct drgn_object *obj,
 	return NULL;
 }
 
-/* This obviously incomplete since we only handle the tokens we care about. */
-enum {
-	C_TOKEN_EOF = -1,
-	MIN_KEYWORD_TOKEN,
-	MIN_SPECIFIER_TOKEN = MIN_KEYWORD_TOKEN,
-	C_TOKEN_VOID = MIN_SPECIFIER_TOKEN,
-	C_TOKEN_CHAR,
-	C_TOKEN_SHORT,
-	C_TOKEN_INT,
-	C_TOKEN_LONG,
-	C_TOKEN_SIGNED,
-	C_TOKEN_UNSIGNED,
-	C_TOKEN_BOOL,
-	C_TOKEN_FLOAT,
-	C_TOKEN_DOUBLE,
-	C_TOKEN_COMPLEX,
-	MAX_SPECIFIER_TOKEN = C_TOKEN_COMPLEX,
-	MIN_QUALIFIER_TOKEN,
-	C_TOKEN_CONST = MIN_QUALIFIER_TOKEN,
-	C_TOKEN_RESTRICT,
-	C_TOKEN_VOLATILE,
-	C_TOKEN_ATOMIC,
-	MAX_QUALIFIER_TOKEN = C_TOKEN_ATOMIC,
-	C_TOKEN_STRUCT,
-	C_TOKEN_UNION,
-	C_TOKEN_CLASS,
-	C_TOKEN_ENUM,
-	MAX_KEYWORD_TOKEN = C_TOKEN_ENUM,
-	C_TOKEN_LPAREN,
-	C_TOKEN_RPAREN,
-	C_TOKEN_LBRACKET,
-	C_TOKEN_RBRACKET,
-	C_TOKEN_ASTERISK,
-	C_TOKEN_DOT,
-	C_TOKEN_NUMBER,
-	C_TOKEN_IDENTIFIER,
-	C_TOKEN_TEMPLATE_ARGUMENTS,
-	C_TOKEN_COLON,
-};
-
 #include "c_keywords.inc"
 
-struct drgn_c_family_lexer {
-	struct drgn_lexer lexer;
-	bool cpp;
-};
-
 struct drgn_error *drgn_c_family_lexer_func(struct drgn_lexer *lexer,
 					    struct drgn_token *token) {
 	const char *p = lexer->p;

libdrgn/lexer.h

@@ -125,10 +125,6 @@ struct drgn_error *drgn_lexer_push(struct drgn_lexer *lexer,
 struct drgn_error *drgn_lexer_peek(struct drgn_lexer *lexer,
 				   struct drgn_token *token);
 
-/* Exported only for testing. */
-struct drgn_error *drgn_c_family_lexer_func(struct drgn_lexer *lexer,
-					    struct drgn_token *token);
-
 /** @} */
 
 #endif /* DRGN_LEXER_H */

libdrgn/python/test.c

@@ -12,51 +12,9 @@
  */
 
 #include "drgnpy.h"
-#include "../lexer.h"
 #include "../path.h"
 #include "../serialize.h"
 
-typeof(drgn_lexer_init) drgn_test_lexer_init;
-DRGNPY_PUBLIC void drgn_test_lexer_init(struct drgn_lexer *lexer,
-					drgn_lexer_func func, const char *str)
-{
-	return drgn_lexer_init(lexer, func, str);
-}
-
-typeof(drgn_lexer_deinit) drgn_test_lexer_deinit;
-DRGNPY_PUBLIC void drgn_test_lexer_deinit(struct drgn_lexer *lexer)
-{
-	return drgn_lexer_deinit(lexer);
-}
-
-typeof(drgn_lexer_pop) drgn_test_lexer_pop;
-DRGNPY_PUBLIC struct drgn_error *drgn_test_lexer_pop(struct drgn_lexer *lexer,
-						     struct drgn_token *token)
-{
-	return drgn_lexer_pop(lexer, token);
-}
-
-typeof(drgn_lexer_push) drgn_test_lexer_push;
-DRGNPY_PUBLIC struct drgn_error *
-drgn_test_lexer_push(struct drgn_lexer *lexer, const struct drgn_token *token)
-{
-	return drgn_lexer_push(lexer, token);
-}
-
-typeof(drgn_lexer_peek) drgn_test_lexer_peek;
-DRGNPY_PUBLIC struct drgn_error *drgn_test_lexer_peek(struct drgn_lexer *lexer,
-						      struct drgn_token *token)
-{
-	return drgn_lexer_peek(lexer, token);
-}
-
-typeof(drgn_c_family_lexer_func) drgn_test_lexer_c;
-DRGNPY_PUBLIC struct drgn_error *drgn_test_lexer_c(struct drgn_lexer *lexer,
-						   struct drgn_token *token)
-{
-	return drgn_c_family_lexer_func(lexer, token);
-}
-
 typeof(path_iterator_next) drgn_test_path_iterator_next;
 DRGNPY_PUBLIC bool drgn_test_path_iterator_next(struct path_iterator *it,
 						const char **component,