Timerix/cobek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LinkedList(Tokens) and memory leak fixes

Browse Source
This commit is contained in:
timerix 2023-03-15 05:53:43 +06:00
parent 0cf8a4e00e
commit e9ffff6e9e
12 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cbuild

@ -1 +1 @@
Subproject commit 112fcc04652d6ce65fbde215cd3d1f8935db2a7c
Subproject commit 9f04507bd880343b5a99194d5c744879cdb9efe4

2
default.config
View File

@ -7,7 +7,7 @@ CMP_C=gcc
CMP_CPP=g++
STD_C=c11
STD_CPP=c++17
WARN_C="-Wall -Wno-discarded-qualifiers -ftrack-macro-expansion=0"
WARN_C="-Wall -Wno-discarded-qualifiers"
WARN_CPP="-Wall"
SRC_C="$( find src -name '*.c')"
SRC_CPP="$( find src -name '*.cpp')"

2
kerep

@ -1 +1 @@
Subproject commit 2a9214fb795e97aa754ac46346310f94b7e61bfd
Subproject commit a200f2c96563f5782ed7b56de5a5889b7d1c31cd

8
src/cb2c/cb2c.c
View File

@ -4,11 +4,11 @@
#define addc(C) StringBuilder_append_char(b, C);
#define adds(S) StringBuilder_append_cptr(b, S);
void appendToken(StringBuilder* b, Token tok, u16* _tab_count){
void appendToken(StringBuilder* b, LLNode(Token)* tokNode, u16* _tab_count){
u16 tab_count=*_tab_count;
adds(tok.value)
adds(tokNode->value.value)
switch(tok.id){
switch(tokNode->value.id){
case tok_lbracket_fi:
tab_count++;
goto add_new_line;
@ -48,7 +48,7 @@ Maybe appendNamespaceContext(StringBuilder* b, NamespaceContext* context){
adds(" */\n\n")
u16 tab_count=0;
Autoarr_foreach(context->base.tokens, tok, appendToken(b, tok, &tab_count));
LinkedList_foreach(context->base.tokens, tok, appendToken(b, tok, &tab_count));
addc('\n');
return MaybeNull;

16
src/cb2c/main.c
View File

@ -1,7 +1,6 @@
#include "../../kerep/src/kprint/kprint.h"
#include "../../kerep/src/Filesystem/filesystem.h"
#include "cb2c.h"
#include "../lexer/lexer.h"
char cb2c_version[]="0.0.1";
@ -117,12 +116,14 @@ i32 main(const int argc, const char* const* argv){
Autoarr_foreach(source_files, src_file_name, ({
tryLast(Lexer_parseFile(lexer, src_file_name), m_tokens)
Autoarr(Token)* tokens=m_tokens.value.VoidPtr;
kprintf("tokens: %u\n", Autoarr_length(tokens));
Autoarr_foreach(tokens, tok, kprintf("%u %s\n",tok.id, tok.value));
LinkedList(Token)* tokens=m_tokens.value.VoidPtr;
kprintf("tokens count: %u\n", tokens->count);
LinkedList_foreach(tokens, tokNode,
kprintf("%u %s\n", tokNode->value.id, tokNode->value.value));
char* basename=path_basename(src_file_name, false);
NamespaceContext file_context={
.base={
.name=path_basename(src_file_name, false),
.name=basename,
.namespace=NULL,
.parent=NULL,
.type=ContextType_Namespace,
@ -138,16 +139,19 @@ i32 main(const int argc, const char* const* argv){
generated_file_name=cptr_concat(file_context.base.namespace,".",file_context.base.name,".g.c");
else generated_file_name=cptr_concat(file_context.base.name,".g.c");
tryLast(file_open(generated_file_name, FileOpenMode_Write), m_generated_file)
File* generated_file=m_generated_file.value.VoidPtr;
FileHandle generated_file=m_generated_file.value.VoidPtr;
kprintf("created file %s\n", generated_file_name);
tryLast(file_writeCptr(generated_file, generated_code),_m_1885);
tryLast(file_close(generated_file),_m_14415);
kprintf("source code has been written to the file\n");
free(basename);
LinkedList_free(tokens);
free(generated_code);
free(generated_file_name);
}));
Autoarr_free(source_files, true);
Lexer_destroy(lexer);
kt_free();
return 0;
}

49
src/lexer/analize.c
View File

@ -15,28 +15,24 @@ void _tryAddLabel(Lexer* lex){
Unitype uni=ST_pullString(lex->keywordSearchTree, lex->label);
if(uni.VoidPtr!=NULL) // built-in keyword
Autoarr_add(lex->tokens, *(Token*)uni.VoidPtr);
LinkedList_addToEnd(lex->tokens, LLNode_create(Token,*(Token*)uni.VoidPtr));
else { // user-defined lex->label
Token ut;
ut.value=string_extract(lex->label);
ut.on_heap=true;
switch(*lex->label.ptr){
TokenId udt_id=tok_label;
switch(*lex->label.ptr){ // starts with number
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
ut.id=tok_number;
break;
default:
ut.id=tok_label;
udt_id=tok_number;
break;
}
Autoarr_add(lex->tokens, ut);
Token udt=Token_createUD(udt_id, string_extract(lex->label));
LinkedList_addToEnd(lex->tokens, LLNode_create(Token,udt));
}
lex->label=(string){lex->source, 0};
};
#define tryAddLabel() _tryAddLabel(lex)
#define addDefTok(id) { tryAddLabel(); Autoarr_add(lex->tokens, default_tokens[id]); }
#define addDefTok(id) { tryAddLabel(); LinkedList_addToEnd(lex->tokens, LLNode_create(Token,default_tokens[id])); }
void _addDefTok_ifnext(Lexer* lex, char next, TokenId yes, TokenId no){
if(*(lex->source+1)==next){
@ -73,7 +69,9 @@ Maybe _readString(Lexer* lex, char quotChar){
Maybe __Lexer_analize(Lexer* lex, char* _filename, char* _source){
lex->filename=_filename;
lex->source=_source;
lex->tokens=Autoarr_create(Token, 64, 1024);
if(lex->tokens!=NULL)
LinkedList_free(lex->tokens);
lex->tokens=LinkedList_create(Token);
lex->label=(string){_source, 0};
lex->line=(string){_source, 0};
lex->linenum=0;
@ -101,22 +99,16 @@ Maybe __Lexer_analize(Lexer* lex, char* _filename, char* _source){
case '\'':
tryAddLabel();
try(readString('\''), maybeC, ;){
Token ctok={
.id=tok_character,
.value=(char*)maybeC.value.VoidPtr
};
Autoarr_add(lex->tokens, ctok);
try(readString('\''), m_ch, ;){
Token ctok=Token_createUD(tok_character, m_ch.value.VoidPtr);
LinkedList_addToEnd(lex->tokens, LLNode_create(Token,ctok));
}
break;
case '"':
tryAddLabel();
try(readString('"'), maybeS, ;){
Token stok={
.id=tok_string,
.value=(char*)maybeS.value.VoidPtr
};
Autoarr_add(lex->tokens, stok);
try(readString('"'), m_Str, ;){
Token stok=Token_createUD(tok_string, m_Str.value.VoidPtr);
LinkedList_addToEnd(lex->tokens, LLNode_create(Token,stok));
}
break;
@ -150,11 +142,8 @@ Maybe __Lexer_analize(Lexer* lex, char* _filename, char* _source){
addDefTok(tok_slash);
break;
}
Token comTok={
.value=string_extract(commentStr),
.id=tok_comment
};
Autoarr_add(lex->tokens, comTok);
Token comTok=Token_createUD(tok_comment, string_extract(commentStr));
LinkedList_addToEnd(lex->tokens, LLNode_create(Token,comTok));
break;
case '=': addDefTok_ifnext('=', tok_equal, tok_assign); break;
@ -180,5 +169,5 @@ Maybe __Lexer_analize(Lexer* lex, char* _filename, char* _source){
}
tryAddLabel();
return SUCCESS(UniHeapPtr(Autoarr(Token), lex->tokens));
return SUCCESS(UniHeapPtr(LinkedList(Token), lex->tokens));
}

8
src/lexer/context.h
View File

@ -14,7 +14,7 @@ STRUCT(Context,
char* name;
char* namespace; /* nullable */
Context* parent; /* nullable */
Autoarr(Token)* tokens;
LinkedList(Token)* tokens;
ContextType type;
)
@ -24,14 +24,14 @@ STRUCT(NamespaceContext,
STRUCT(ClassContext,
Context base;
Autoarr(Token)* attributes;
LinkedList(Token)* attributes;
Token accessModifier;
)
STRUCT(FunctionContext,
Context base;
Autoarr(Token)* arguments;
Autoarr(Token)* attributes;
LinkedList(Token)* arguments;
LinkedList(Token)* attributes;
Token accessModifier;
Token returnType;
)

3
src/lexer/init.c
View File

@ -2,5 +2,6 @@
void kt_initLexerTypes(){
kt_register(Token);
kt_register(Autoarr_Token);
kt_register(LinkedList_Token);
kt_register(LLNode_Token);
}

12
src/lexer/lexer.c
View File

@ -29,15 +29,17 @@ void Lexer_destroy(Lexer* lex){
free(lex);
}
///@return Maybe<Autoarr(Token)*>
///@return Maybe<LinkedList(Token)*>
Maybe Lexer_parseFile(Lexer* lex, char* src_file_name){
try(file_open(src_file_name, FileOpenMode_Read), m_src_file,;)
File* src_file=m_src_file.value.VoidPtr;
FileHandle src_file=m_src_file.value.VoidPtr;
char* src_text;
try(file_readAll(src_file, &src_text), m_src_len, file_close(src_file))
u64 src_len=m_src_len.value.UInt64;
try(file_close(src_file),_m_215, free(src_text));
kprintf("srclen: %lu\n", src_len);
try(Lexer_parseText(lex, src_file_name, src_text), m_tokens, file_close(src_file))
Autoarr(Token)* tokens=m_tokens.value.VoidPtr;
return SUCCESS(UniHeapPtr(Autoarr(Token), tokens));
try(Lexer_parseText(lex, src_file_name, src_text), m_tokens,;)
LinkedList(Token)* tokens=m_tokens.value.VoidPtr;
free(src_text);
return SUCCESS(UniHeapPtr(LinkedList(Token), tokens));
}

8
src/lexer/lexer.h
View File

@ -11,7 +11,7 @@ STRUCT(Lexer,
char* source;
char* filename;
Autoarr(Token)* tokens;
LinkedList(Token)* tokens;
string context;
string line;
string label;
@ -21,12 +21,12 @@ STRUCT(Lexer,
Lexer* Lexer_create();
void Lexer_destroy(Lexer* lex);
///@return Maybe<Autoarr(Token)*>
///@return Maybe<LinkedList(Token)*>
///@return Maybe<Autoarr(Token)*>
///@return Maybe<LinkedList(Token)*>
Maybe Lexer_parseFile(Lexer* lex, char* src_file_name);
///@return Maybe<Autoarr(Token)*>
///@return Maybe<LinkedList(Token)*>
static inline Maybe Lexer_parseText(Lexer* lex, char* src_file_name, char* src_file_text){
return lex->analize(lex, src_file_name, src_file_text);
}

2
src/lexer/tokens.c
View File

@ -11,4 +11,4 @@ char* Token_toString(void* _t, u32 fmt){
}
kt_define(Token, Token_freeMembers, Token_toString);
Autoarr_define(Token, false)
LinkedList_define(Token, false)

6
src/lexer/tokens.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "../../kerep/src/Autoarr/Autoarr.h"
#include "../../kerep/src/LinkedList/LinkedList.h"
#include "../../kerep/src/SearchTree/SearchTree.h"
PACKED_ENUM(TokenId,
@ -104,7 +104,9 @@ STRUCT(Token,
TokenId id;
bool on_heap; // allocated on stack or heap
)
Autoarr_declare(Token)
LinkedList_declare(Token)
/// user-defined token constructor
#define Token_createUD(ID, VALUE) (Token){ .id=ID, .value=VALUE, .on_heap=true }
static const Token default_tokens[]={
/* base types */