Add more lex tests

src/lexer/lex.c

@@ -25,10 +25,10 @@ int is_valid_numeric_or_id_char(char c) {
     return isalnum(c) || (c == '_') || (c == '.');
 }
 
-int real_lex(Lexer*, Token*);
+int real_lex(Lexer *, Token *);
 
 /**
- * This produces a list of tokens after having been processed by the 
+ * This produces a list of tokens after having been processed by the
  * preprocessor. For example, if the code is
  * #define MAX_ARRAY 5
  * int arr[MAX_ARRAY];
@@ -40,7 +40,7 @@ int real_lex(Lexer*, Token*);
  * ]
  * ;
  */
-int lex(Lexer* l, Token* t) {
+int lex(Lexer *l, Token *t) {
     // For now, all we need to do is skip newlines
     for (;;) {
         real_lex(l, t);
@@ -203,6 +203,7 @@ int skip_to_token(Lexer *l) {
     return -1; // EOF was reached
 }
 
+// This is a function for parsing single char tokens
 TokenType ttype_one_char(char c) {
     switch (c) {
     case '(':
@@ -256,6 +257,7 @@ TokenType ttype_one_char(char c) {
     return TT_NO_TOKEN;
 }
 
+// This is a function for parsing exclusively tokens with more than one char
 TokenType ttype_many_chars(const char *contents) {
     if (STREQ(contents, "auto")) {
         return TT_AUTO;
@@ -423,6 +425,7 @@ TokenType ttype_many_chars(const char *contents) {
     return TT_IDENTIFIER;
 }
 
+// This is the function for parsing all tokens from strings
 TokenType ttype_from_string(const char *contents) {
     int len;
 
@@ -528,9 +531,48 @@ static const char *ttype_names[] = {
 
 const char *ttype_name(TokenType tt) { return ttype_names[tt]; }
 
+int test_ttype_many_chars() {
+    testing_func_setup();
+
+    tassert(ttype_many_chars("foo") == TT_IDENTIFIER);
+    tassert(ttype_many_chars("struct") == TT_STRUCT);
+    tassert(ttype_many_chars("while") == TT_WHILE);
+
+    return 0;
+}
+
+int test_ttype_one_char() {
+    testing_func_setup();
+
+    // Use ttype_from_string
+    tassert(ttype_one_char('a') == TT_NO_TOKEN);
+    tassert(ttype_one_char('1') == TT_NO_TOKEN);
+
+    tassert(ttype_one_char('+') == TT_PLUS);
+    tassert(ttype_one_char('-') == TT_MINUS);
+    tassert(ttype_one_char('>') == TT_GREATER);
+    tassert(ttype_one_char('~') == TT_BNOT);
+
+    return 0;
+}
+
+int test_ttype_name() {
+    testing_func_setup();
+
+    tassert(strcmp(ttype_name(TT_LITERAL), "literal") == 0);
+    tassert(strcmp(ttype_name(TT_PLUS), "+") == 0);
+    tassert(strcmp(ttype_name(TT_SIZEOF), "sizeof") == 0);
+    tassert(strcmp(ttype_name(TT_WHILE), "while") == 0);
+
+    return 0;
+}
+
 int test_ttype_from_string() {
     testing_func_setup();
 
+    tassert(ttype_from_string("+") == TT_PLUS);
+    tassert(ttype_from_string("=") == TT_ASSIGN);
+
     tassert(ttype_from_string("1") == TT_LITERAL);
     tassert(ttype_from_string("1.2") == TT_LITERAL);
 

src/lexer/lex.h

@@ -40,3 +40,9 @@ const char *ttype_name(TokenType tt);
 
 // Test for ttype_from_string
 int test_ttype_from_string();
+
+int test_ttype_many_chars();
+
+int test_ttype_one_char();
+
+int test_ttype_name();

src/lexer/test_lexer.c

@@ -8,7 +8,10 @@
 int test_lexer() {
     testing_module_setup();
 
+    test_ttype_name();
     test_ttype_from_string();
+    test_ttype_many_chars();
+    test_ttype_one_char();
 
     testing_module_cleanup();
     return 0;