From a53b848933e97b45d7ee1307afd6ee706283104e Mon Sep 17 00:00:00 2001
From: timerix <timerix11@gmail.com>
Date: Sun, 15 Jan 2023 22:01:20 +0600
Subject: [PATCH] fixed compilation errors

---
 .gitignore         | 2 +-
 default.config     | 1 -
 src/lexer/init.c   | 8 +++-----
 src/lexer/lexer.c  | 4 ++--
 src/lexer/tokens.c | 8 ++------
 src/lexer/tokens.h | 6 +-----
 6 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87229ff..cab1d1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@ obj/
 .editorconfig
 *.user
 *.vcxproj.filters
-current.config
\ No newline at end of file
+current.config
diff --git a/default.config b/default.config
index e14e54d..dee35b4 100644
--- a/default.config
+++ b/default.config
@@ -18,7 +18,6 @@ OUTDIR=bin
 OBJDIR=obj
 EXEC_FILE=cb2c.com
 
-
 case $TASK in
     build_exec)
         C_ARGS="-O2"
diff --git a/src/lexer/init.c b/src/lexer/init.c
index 8b00e3a..55105a1 100644
--- a/src/lexer/init.c
+++ b/src/lexer/init.c
@@ -1,8 +1,6 @@
 #include "lexer.h"
 
 void ktDescriptors_initCbLexerTypes(){
-    kt_register(Token, ktId_Token, NULL, NULL);
-    kt_register(Token*, ktId_TokenPtr, NULL, NULL);
-    kt_register(Autoarr_Token, ktId_AutoarrToken, ____Autoarr_free_Token, NULL);
-    kt_register(Autoarr_Token*, ktId_AutoarrTokenPtr, ____Autoarr_free_Token, NULL);
-}
\ No newline at end of file
+    kt_register(Token, NULL, NULL);
+    kt_register(Autoarr_Token, ____Autoarr_free_Token, NULL);
+}
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index 36764e2..04abf45 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -80,7 +80,7 @@ Maybe _readString(char quotChar, SharedLexerData* sld){
             else { // "
                 string str={srcFirst, source-srcFirst+1};
                 char* extracted=string_extract(str);
-                return SUCCESS(UniHeap(ktId_CharPtr, extracted));
+                return SUCCESS(UniHeapPtr(char, extracted));
             }
         } 
         else prevIsBackslash= c=='\\' && !prevIsBackslash;
@@ -255,7 +255,7 @@ Maybe _lexan(SharedLexerData* sld){
             break;
     }
     
-    return SUCCESS(UniHeap(ktId_AutoarrTokenPtr,tokens));
+    return SUCCESS(UniHeapPtr(Autoarr(Token), tokens));
 }
 
 
diff --git a/src/lexer/tokens.c b/src/lexer/tokens.c
index e282466..92e2772 100644
--- a/src/lexer/tokens.c
+++ b/src/lexer/tokens.c
@@ -1,11 +1,7 @@
 #include "tokens.h"
 
-ktId_define(ktId_Token);
-ktId_define(ktId_TokenPtr);
-
+ktid_define(Token);
 Autoarr_define(Token)
-ktId_define(ktId_AutoarrToken);
-ktId_define(ktId_AutoarrTokenPtr);
 
 
 STNode* keywordsSearchTree=NULL;
@@ -13,7 +9,7 @@ void init_keywordsSearchTree(){
     keywordsSearchTree=STNode_create();
     for(TokenId keywordId=0; keywordId<=tok_typeof; keywordId++){
         const Token* keywordptr=&default_tokens[keywordId];
-        Unitype uni=UniStack(ktId_TokenPtr, keywordptr);
+        Unitype uni=UniStackPtr(Token, keywordptr);
         ST_push(keywordsSearchTree, keywordptr->value, uni);
     }
 }
diff --git a/src/lexer/tokens.h b/src/lexer/tokens.h
index 8930b15..439d626 100644
--- a/src/lexer/tokens.h
+++ b/src/lexer/tokens.h
@@ -103,12 +103,8 @@ typedef struct Token{
     char* value;
     TokenId id;
 } Token;
-ktId_declare(ktId_Token);
-ktId_declare(ktId_TokenPtr);
-
+ktid_declare(Token);
 Autoarr_declare(Token)
-ktId_declare(ktId_AutoarrToken);
-ktId_declare(ktId_AutoarrTokenPtr);
 
 extern STNode* keywordsSearchTree;
 // dont forget to free it