kerep update

This commit is contained in:
timerix 2023-01-20 15:28:57 +06:00
parent 83822bb1ed
commit 69449891e1
7 changed files with 14 additions and 10 deletions

5
.vscode/tasks.json vendored
View File

@ -30,12 +30,13 @@
}, },
{ {
"label": "build_dbg", "label": "build_cb2c_dbg",
"detail": "build project with debug symbols", "detail": "build project with debug symbols",
"type": "cppbuild", "type": "cppbuild",
"command": "make", "command": "make",
"args": [ "args": [
"build_dbg" "rebuild_kerep",
"build_exec_dbg"
], ],
"options": { "options": {
"cwd": "${workspaceFolder}" "cwd": "${workspaceFolder}"

2
cbuild

@ -1 +1 @@
Subproject commit 47808ee989c85b6d011851dbec24c39580b55cbb Subproject commit 15a9661c467facf65b2155eab3fad1ecf5f0c945

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
CBUILD_VERSION=3 CBUILD_VERSION=4
CONFIG_VERSION=5 CONFIG_VERSION=5
PROJECT=cobek PROJECT=cobek

2
kerep

@ -1 +1 @@
Subproject commit 37dc5c6177ec55f30ad0db0612272a0e69c75205 Subproject commit 40d1828f2cfa68e03cccaa2b3658eba07c146b02

View File

@ -1,6 +1,9 @@
#include "cb2c.h" #include "cb2c.h"
#include "../../kerep/src/kprint/kprint.h"
int main(){ int main(){
if(!setlocale(LC_ALL, "C.UTF8"))
kprintf("\e[93msetlocale failed\n");
// kerep type system // kerep type system
ktDescriptors_beginInit(); ktDescriptors_beginInit();
ktDescriptors_initKerepTypes(); ktDescriptors_initKerepTypes();
@ -8,7 +11,7 @@ int main(){
ktDescriptors_endInit(); ktDescriptors_endInit();
// keywords search tree // keywords search tree
init_keywordsSearchTree(); init_keywordsSearchTree();
printf("keywordsSearchTree: %p\n", keywordsSearchTree); kprint(kp_s|kp_fgGray, "keywordsSearchTree: ", kp_h|kp_pre, keywordsSearchTree, kp_c, '\n');
STNode_free(keywordsSearchTree); STNode_free(keywordsSearchTree);
return 0; return 0;
} }

View File

@ -5,11 +5,11 @@
typedef struct ContextStruct Context; typedef struct ContextStruct Context;
typedef enum ContextType{ PACK_ENUM(ContextType,
CT_Namespace, CT_Namespace,
CT_Function, CT_Function,
CT_Class CT_Class
} __attribute__((__packed__)) ContextType; )
struct ContextStruct { struct ContextStruct {
char* name; char* name;

View File

@ -3,7 +3,7 @@
#include "../../kerep/src/Autoarr/Autoarr.h" #include "../../kerep/src/Autoarr/Autoarr.h"
#include "../../kerep/src/SearchTree/SearchTree.h" #include "../../kerep/src/SearchTree/SearchTree.h"
typedef enum TokenId{ PACK_ENUM(TokenId,
// base types // base types
tok_void_t, tok_void_t,
tok_int8_t, tok_int8_t,
@ -97,7 +97,7 @@ typedef enum TokenId{
tok_character, tok_character,
tok_string, tok_string,
tok_comment tok_comment
} __attribute__((__packed__)) TokenId; )
typedef struct Token{ typedef struct Token{
char* value; char* value;