From 4dc58b85c19d7e8744b4a72958856197ad8b7faa Mon Sep 17 00:00:00 2001 From: Kyler Date: Thu, 30 Oct 2025 22:22:50 -0600 Subject: [PATCH] Added test_token_type function --- SLS_C/tests/lexer_tests.c | 68 ++++++++++----------------------------- 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/SLS_C/tests/lexer_tests.c b/SLS_C/tests/lexer_tests.c index f379780..3dc0bb6 100644 --- a/SLS_C/tests/lexer_tests.c +++ b/SLS_C/tests/lexer_tests.c @@ -191,7 +191,7 @@ static char *boolean_should_be(size_t i, Boolean value) { // Test parts -static Boolean test_eof_value(LexerTest *test, LexerResult result, size_t i) { +static Boolean test_token_type(LexerTest *test, LexerResult result, size_t i, TokenType token_type) { LexerTokenResult *head = get_token(result.result, i); if (head == 0) { logic_fail_test(test, result, unexpected_end_of_token_stream(i + 1)); @@ -199,8 +199,16 @@ static Boolean test_eof_value(LexerTest *test, LexerResult result, size_t i) { } if (head->type == SLS_ERROR) { error_fail_test(test, result, result.error); return TRUE; - } if (head->result.type != TOKEN_EOF) { - logic_fail_test(test, result, token_should_be(i + 1, TOKEN_EOF, head->result.type)); + } if (head->result.type != token_type) { + logic_fail_test(test, result, token_should_be(i + 1, token_type, head->result.type)); + return TRUE; + } + return FALSE; +} + +static Boolean test_eof_value(LexerTest *test, LexerResult result, size_t i) { + LexerTokenResult *head = get_token(result.result, i); + if (test_token_type(test, result, i, TOKEN_EOF)) { return TRUE; } if (head->next != 0) { logic_fail_test(test, result, expected_end_of_token_stream(i + 1)); @@ -211,14 +219,7 @@ static Boolean test_eof_value(LexerTest *test, LexerResult result, size_t i) { static Boolean test_identifier_value(LexerTest *test, LexerResult result, size_t i, Boolean is_literal, size_t length, const char *name) { LexerTokenResult *head = get_token(result.result, i); - if (head == 0) { - logic_fail_test(test, result, unexpected_end_of_token_stream(i + 1)); - return TRUE; - } if (head->type == SLS_ERROR) { - error_fail_test(test, result, result.error); - return TRUE; - } if (head->result.type != TOKEN_IDENTIFIER) { - logic_fail_test(test, result, token_should_be(i + 1, TOKEN_IDENTIFIER, head->result.type)); + if (test_token_type(test, result, i, TOKEN_IDENTIFIER)) { return TRUE; } if (head->result.identifier.is_literal != is_literal) { logic_fail_test(test, result, is_literal ? identifier_should_be_literal(i + 1) : identifier_should_not_be_literal(i + 1)); @@ -235,14 +236,7 @@ static Boolean test_identifier_value(LexerTest *test, LexerResult result, size_t static Boolean test_integer_value(LexerTest *test, LexerResult result, size_t i, IntegerBuiltInType type, uint64_t value) { LexerTokenResult *head = get_token(result.result, i); - if (head == 0) { - logic_fail_test(test, result, unexpected_end_of_token_stream(i + 1)); - return TRUE; - } if (head->type == SLS_ERROR) { - error_fail_test(test, result, result.error); - return TRUE; - } if (head->result.type != TOKEN_INTEGER) { - logic_fail_test(test, result, token_should_be(i + 1, TOKEN_INTEGER, head->result.type)); + if (test_token_type(test, result, i, TOKEN_INTEGER)) { return TRUE; } if (head->result.integer_literal.type != type) { logic_fail_test(test, result, integer_type_should_be(i + 1, type, head->result.integer_literal.type)); @@ -256,14 +250,7 @@ static Boolean test_integer_value(LexerTest *test, LexerResult result, size_t i, static Boolean test_float_value(LexerTest *test, LexerResult result, size_t i, float value) { LexerTokenResult *head = get_token(result.result, i); - if (head == 0) { - logic_fail_test(test, result, unexpected_end_of_token_stream(i + 1)); - return TRUE; - } if (head->type == SLS_ERROR) { - error_fail_test(test, result, result.error); - return TRUE; - } if (head->result.type != TOKEN_FLOAT) { - logic_fail_test(test, result, token_should_be(i + 1, TOKEN_FLOAT, head->result.type)); + if (test_token_type(test, result, i, TOKEN_FLOAT)) { return TRUE; } if (head->result.float_literal - value) { logic_fail_test(test, result, float_value_should_be(i + 1, value, head->result.float_literal)); @@ -274,14 +261,7 @@ static Boolean test_float_value(LexerTest *test, LexerResult result, size_t i, f static Boolean test_double_value(LexerTest *test, LexerResult result, size_t i, double value) { LexerTokenResult *head = get_token(result.result, i); - if (head == 0) { - logic_fail_test(test, result, unexpected_end_of_token_stream(i + 1)); - return TRUE; - } if (head->type == SLS_ERROR) { - error_fail_test(test, result, result.error); - return TRUE; - } if (head->result.type != TOKEN_DOUBLE) { - logic_fail_test(test, result, token_should_be(i + 1, TOKEN_DOUBLE, head->result.type)); + if (test_token_type(test, result, i, TOKEN_DOUBLE)) { return TRUE; } if (head->result.float_literal - value) { logic_fail_test(test, result, float_value_should_be(i + 1, value, head->result.float_literal)); @@ -292,14 +272,7 @@ static Boolean test_double_value(LexerTest *test, LexerResult result, size_t i, static Boolean test_string_value(LexerTest *test, LexerResult result, size_t i, size_t length, const char *value) { LexerTokenResult *head = get_token(result.result, i); - if (head == 0) { - logic_fail_test(test, result, unexpected_end_of_token_stream(i + 1)); - return TRUE; - } if (head->type == SLS_ERROR) { - error_fail_test(test, result, result.error); - return TRUE; - } if (head->result.type != TOKEN_STRING) { - logic_fail_test(test, result, token_should_be(i + 1, TOKEN_STRING, head->result.type)); + if (test_token_type(test, result, i, TOKEN_STRING)) { return TRUE; } if (head->result.string_literal.length == strnlen(value, length)) { logic_fail_test(test, result, token_length_should_be(i + 1, TOKEN_STRING, strnlen(value, length), head->result.string_literal.length)); @@ -313,14 +286,7 @@ static Boolean test_string_value(LexerTest *test, LexerResult result, size_t i, static Boolean test_boolean_value(LexerTest *test, LexerResult result, size_t i, Boolean value) { LexerTokenResult *head = get_token(result.result, i); - if (head == 0) { - logic_fail_test(test, result, unexpected_end_of_token_stream(i + 1)); - return TRUE; - } if (head->type == SLS_ERROR) { - error_fail_test(test, result, result.error); - return TRUE; - } if (head->result.type != TOKEN_BOOLEAN) { - logic_fail_test(test, result, token_should_be(i + 1, TOKEN_BOOLEAN, head->result.type)); + if (test_token_type(test, result, i, TOKEN_BOOLEAN)) { return TRUE; } if (head->result.boolean_literal != value) { logic_fail_test(test, result, boolean_should_be(i + 1, value));