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

updated throw_wrongchar(), removoved null parsing, commits cleared

Browse Source
This commit is contained in:
Timerix22 2022-04-17 00:50:24 +03:00
parent b4f2ca92c7
commit 394fbffc12
21 changed files with 137 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Autoarr/Autoarr.c
View File

@ -12,7 +12,7 @@ define_Autoarr(float)
define_Autoarr(double)
define_Autoarr(Unitype)
//right func to clear array of unitype values
// right func to clear array of unitype values
void Autoarr_Unitype_clear(Autoarr(Unitype)* ar){
for(uint32 blockI=0;blockI<ar->blocks_count-1;blockI++)
for(uint32 elemI=0;elemI<ar->max_block_length;elemI++)

2
Autoarr/Autoarr.h
View File

@ -19,7 +19,7 @@ declare_Autoarr(float)
declare_Autoarr(double)
declare_Autoarr(Unitype)
//right func to clear array of unitype values
// right func to clear array of unitype values
void Autoarr_Unitype_clear(Autoarr(Unitype)* ar);
#define Autoarr_foreach(ar,elem,codeblock)({\

10
DtsodParser/DtsodV24.c
View File

@ -1,24 +1,24 @@
#include "DtsodV24.h"
//returns UniNull if key not found
// returns UniNull if key not found
Unitype DtsodV24_get(Hashtable* dtsod, char* key){
return Hashtable_get(dtsod, key);
}
//adds or sets value
// adds or sets value
void DtsodV24_addOrSet(Hashtable* dtsod, char* key, Unitype value){
Unitype* val=Hashtable_getptr(dtsod, key);
if(val) *val=value;
else Hashtable_add(dtsod, key, value);
}
//checks for dtsod contains value or dont
// checks for dtsod contains value or dont
bool DtsodV24_contains(Hashtable* dtsod, char* key){
Unitype* val=Hashtable_getptr(dtsod, key);
return val!=NULL;
}
//replaces value with UniNull if key exists in dtsod
// replaces value with UniNull if key exists in dtsod
bool DtsodV24_remove(Hashtable* dtsod, char* key){
Unitype* val=Hashtable_getptr(dtsod, key);
if (!val) return false;
@ -26,7 +26,7 @@ bool DtsodV24_remove(Hashtable* dtsod, char* key){
return true;
}
//frees memory including memory of elements (hashtables, autoarrs, etc.)
// frees memory including memory of elements (hashtables, autoarrs, etc.)
void DtsodV24_free(Hashtable* dtsod){
Hashtable_free(dtsod);
}

14
DtsodParser/DtsodV24.h
View File

@ -6,25 +6,25 @@ extern "C" {
#include "../Hashtable/Hashtable.h"
//parses text to binary values
// parses text to binary values
Maybe DtsodV24_deserialize(char* text);
//creates text representation of dtsod
// creates text representation of dtsod
char* DtsodV24_serialize(Hashtable* dtsod);
//returns value or UniNull if key not found
// returns value or UniNull if key not found
Unitype DtsodV24_get(Hashtable* dtsod, char* key);
//adds or sets value
// adds or sets value
void DtsodV24_addOrSet(Hashtable* dtsod, char* key, Unitype value);
//checks for dtsod contains value or dont
// checks for dtsod contains value or dont
bool DtsodV24_contains(Hashtable* dtsod, char* key);
//replaces value with UniNull if key exists in dtsod
// replaces value with UniNull if key exists in dtsod
bool DtsodV24_remove(Hashtable* dtsod, char* key);
//frees memory including memory of elements (hashtables, autoarrs, etc.)
// frees memory including memory of elements (hashtables, autoarrs, etc.)
void DtsodV24_free(Hashtable* dtsod);
#if __cplusplus

70
DtsodParser/DtsodV24_deserialize.c
View File

@ -6,19 +6,36 @@
#define STRB_BC 64
#define STRB_BL 1024
Maybe ERROR_WRONGCHAR(char c, char* text){
char errBuf[]="unexpected <c> at:\n \""
"00000000000000000000000000000000\"";
errBuf[12]=c;
for(uint8 i=0; i<32; i++)
// special func for throwing error messages about wrong characters in deserializing text
Maybe ERROR_WRONGCHAR(const char c, char* text, char* text_first, const char* srcfile, int line, const char* funcname){
char errBuf[33];
errBuf[32]='\0';
char* errText=text-16;
if(errText<text_first) errText=text_first;
for(uint8 i=0; i<32; i++){
// writes 16 chars before and 15 after the wrongchar
errBuf[i+22]=*(text - 16 + i);
safethrow(cptr_copy(errBuf));
char _c=errText[i];
errBuf[i]=_c;
if(!_c) break;
}
char* errmsg=malloc(256);
IFWIN(
sprintf_s(errmsg,256, "unexpected <%c> at:\n"
" \"%s\"\n"
"\\___[%s:%d] %s()",
c,errBuf, srcfile,line,funcname),
sprintf(errmsg, "unexpected <%c> at:\n"
" \"%s\"\n"
" \\___[%s:%d] %s()",
c,errBuf, srcfile,line,funcname)
);
safethrow(cptr_copy(errmsg));
}
#define safethrow_wrongchar(C) return ERROR_WRONGCHAR(C, text)
#define safethrow_wrongchar(C) return ERROR_WRONGCHAR(C, text, shared->sh_text_first, __FILE__,__LINE__,__func__)
typedef struct DeserializeSharedData{
const char* sh_text_first;
char* sh_text;
bool sh_partOfDollarList;
bool sh_readingList;
@ -58,7 +75,7 @@ Maybe __ReadName(DeserializeSharedData* shared){
try(SkipComment(),_);
if(nameStr.length!=0)
safethrow_wrongchar(c);
nameStr.ptr=text+1; //skips '\n'
nameStr.ptr=text+1; // skips '\n'
break;
case '}':
if(!calledRecursively) safethrow_wrongchar(c);
@ -86,7 +103,7 @@ Maybe __deserialize(char** _text, bool _calledRecursively);
Maybe __ReadValue(DeserializeSharedData* shared);
#define ReadValue() __ReadValue(shared)
//returns part of <text> without quotes
// returns part of <text> without quotes
Maybe __ReadString(DeserializeSharedData* shared){
char c;
bool prevIsBackslash=false;
@ -95,7 +112,7 @@ Maybe __ReadString(DeserializeSharedData* shared){
while ((c=*++text)){
if(c=='"') {
if(prevIsBackslash) {
//replacing <\"> with <">
// replacing <\"> with <">
Autoarr_remove(b);
StringBuilder_append_char(b,c);
}
@ -128,34 +145,25 @@ Maybe __ReadList(DeserializeSharedData* shared){
#define ReadList() __ReadList(shared)
Maybe __ParseValue(DeserializeSharedData* shared, string str){
//printf("\e[94m<\e[96m%s\e[94m>\n",string_cpToCptr(str));
const string nullStr={"null",4};
const string trueStr={"true",4};
const string falseStr={"false",5};
switch(*str.ptr){
case 'n':
if(string_compare(str,nullStr))
return SUCCESS(UniNull);
else safethrow_wrongchar(*str.ptr);
break;
case 't':
switch(str.ptr[str.length-1]){
// Bool
case 'e':
if(string_compare(str,trueStr))
return SUCCESS(UniTrue);
else safethrow_wrongchar(*str.ptr);
break;
case 'f':
if(string_compare(str,falseStr))
else if(string_compare(str,falseStr))
return SUCCESS(UniFalse);
else safethrow_wrongchar(*str.ptr);
break;
default:
switch(str.ptr[str.length-1]){
// Float64
case 'f': {
char* _c=string_cpToCptr(str);
Unitype rez=Uni(Float64,strtod(_c,NULL));
free(_c);
return SUCCESS(rez);
}
// UInt64
case 'u': {
uint64 lu=0;
char* _c=string_cpToCptr(str);
@ -163,6 +171,7 @@ Maybe __ParseValue(DeserializeSharedData* shared, string str){
free(_c);
return SUCCESS(Uni(UInt64,lu));
}
// Int64
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': {
int64 li=0;
@ -178,10 +187,10 @@ Maybe __ParseValue(DeserializeSharedData* shared, string str){
free(_c);
return SUCCESS(Uni(Int64,li));
}
// wrong type
default:
safethrow_wrongchar(str.ptr[str.length-1]);
}
}
safethrow(ERR_ENDOFSTR);
};
#define ParseValue(str) __ParseValue(shared, str)
@ -207,7 +216,7 @@ Maybe __ReadValue(DeserializeSharedData* shared){
try(SkipComment(),_);
if(valueStr.length!=0)
safethrow_wrongchar(_c);
valueStr.ptr=text+1; //skips '\n'
valueStr.ptr=text+1; // skips '\n'
break;
case '"':
if(valueStr.length!=0) safethrow_wrongchar(c);
@ -223,7 +232,7 @@ Maybe __ReadValue(DeserializeSharedData* shared){
break;
case '{':
if(valueStr.length!=0) safethrow_wrongchar(c);
++text; //skips '{'
++text; // skips '{'
try(__deserialize(&text,true), val)
return SUCCESS(val.value);
case ';':
@ -244,6 +253,7 @@ Maybe __ReadValue(DeserializeSharedData* shared){
Maybe __deserialize(char** _text, bool _calledRecursively) {
DeserializeSharedData _shared={
.sh_text_first=*_text,
.sh_text=*_text,
.sh_partOfDollarList=false,
.sh_readingList=false,
@ -256,7 +266,7 @@ Maybe __deserialize(char** _text, bool _calledRecursively) {
text--;
while((c=*++text)){
try(ReadName(), maybeName)
if(!maybeName.value.VoidPtr) //end of file or '}' in recursive call
if(!maybeName.value.VoidPtr) // end of file or '}' in recursive call
goto END;
char* nameCPtr=maybeName.value.VoidPtr;
try(ReadValue(), val)

14
DtsodParser/DtsodV24_exported.c
View File

@ -10,39 +10,39 @@ extern "C" {
#include "DtsodV24.h"
//parses text to binary values
// parses text to binary values
EXPORT void CALL kerep_DtsodV24_deserialize(char* text, Hashtable** output, char** errmsg){
Maybe r=DtsodV24_deserialize(text);
*errmsg= r.errmsg ? r.errmsg : NULL;
*output=r.value.VoidPtr;
}
//creates text representation of dtsod
// creates text representation of dtsod
EXPORT void CALL kerep_DtsodV24_serialize(Hashtable* dtsod, char** output){
*output=DtsodV24_serialize(dtsod);
}
//returns value or UniNull if key not found
// returns value or UniNull if key not found
EXPORT void CALL kerep_DtsodV24_get(Hashtable* dtsod, char* key, Unitype* output){
*output=DtsodV24_get(dtsod, key);
}
//adds or sets the value
// adds or sets the value
EXPORT void CALL kerep_DtsodV24_addOrSet(Hashtable* dtsod, char* key, Unitype value){
DtsodV24_addOrSet(dtsod, key, value);
}
//checks for dtsod contains value or dont
// checks for dtsod contains value or dont
EXPORT void CALL kerep_DtsodV24_contains(Hashtable* dtsod, char* key, bool* output){
*output=DtsodV24_contains(dtsod, key);
}
//replaces value with UniNull if key exists in dtsod
// replaces value with UniNull if key exists in dtsod
EXPORT void CALL kerep_DtsodV24_remove(Hashtable* dtsod, char* key, bool* output){
*output=DtsodV24_remove(dtsod, key);
}
//replaces value with UniNull if key exists in dtsod
// replaces value with UniNull if key exists in dtsod
EXPORT void CALL kerep_DtsodV24_free(Hashtable* dtsod){
DtsodV24_free(dtsod);
}

5
DtsodParser/DtsodV24_serialize.c
View File

@ -1,7 +1,7 @@
#include "DtsodV24.h"
#include "../Autoarr/StringBuilder.h"
//65536 max length!
// 65536 max length!
#define STRB_BC 64
#define STRB_BL 1024
@ -51,8 +51,7 @@ void __AppendValue(SerializeSharedData* shared, Unitype u){
StringBuilder_append_cptr(b, u.Bool ? "true" : "false");
break;
case Null:
if(!u.VoidPtr) StringBuilder_append_cptr(b, "null");
else throw("Null-type pointer is not 0");
throw("Null isn't supported in DtsodV24");
break;
case AutoarrUnitypePtr:
addc('[');

2
Hashtable/Hashtable.c
View File

@ -64,7 +64,7 @@ void Hashtable_add(Hashtable* ht, char* key, Unitype u){
Hashtable_add_pair(ht,KVPair(key,u));
}
//returns null or pointer to value in hashtable
// returns null or pointer to value in hashtable
Unitype* Hashtable_getptr(Hashtable* ht, char* key){
Autoarr(KeyValuePair)* ar=getrow(ht,key,false);
uint32 arlen=Autoarr_length(ar);

12
Hashtable/Hashtable.h
View File

@ -9,18 +9,18 @@ extern "C" {
#include "KeyValuePair.h"
typedef struct Hashtable{
uint8 hein; //height=HT_HEIGHTS[hein]
uint8 hein; // height=HT_HEIGHTS[hein]
Autoarr(KeyValuePair)* rows; // Autoarr[height]
} Hashtable;
Hashtable* Hashtable_create();
void Hashtable_free(Hashtable* ht);
//amount of rows
// amount of rows
uint32 Hashtable_height(Hashtable* ht);
//adds charptr and value to new KeyValuePair
//use cptr_copy() to create new string if needed
// adds charptr and value to new KeyValuePair
// use cptr_copy() to create new string if needed
#define KVPair(key,value) (KeyValuePair){key,value}
//
@ -30,14 +30,14 @@ uint32 Hashtable_height(Hashtable* ht);
void Hashtable_add_pair(Hashtable* ht, KeyValuePair p);
void Hashtable_add(Hashtable* ht, char* key, Unitype u);
//returns null or pointer to value in hashtable
// returns null or pointer to value in hashtable
Unitype* Hashtable_getptr(Hashtable* ht, char* key);
Unitype Hashtable_get(Hashtable* ht, char* key);
KeyValuePair Hashtable_get_pair(Hashtable* ht, char* key);
bool Hashtable_try_get(Hashtable* ht, char* key, Unitype* output);
//not implemented yet
// not implemented yet
void Hashtable_set_pair(Hashtable* ht, KeyValuePair p);
void Hashtable_set(Hashtable* ht, char* key, Unitype u);

4
Hashtable/KeyValuePair.c
View File

@ -3,13 +3,13 @@
define_Autoarr(KeyValuePair)
//proper way to clear a KVP
// proper way to clear a KVP
void KeyValuePair_free(KeyValuePair p){
free(p.key);
Unitype_free(p.value);
}
//func for KVP array clearing
// func for KVP array clearing
void Autoarr_KeyValuePair_clear(Autoarr_KeyValuePair* ar){
for(uint16 blockI=0; blockI < ar->blocks_count-1; blockI++)
for(uint16 elemI=0; elemI < ar->max_block_length; elemI++)

4
Hashtable/KeyValuePair.h
View File

@ -14,10 +14,10 @@ typedef struct KeyValuePair{
declare_Autoarr(KeyValuePair)
//proper way to clear a KVP
// proper way to clear a KVP
void KeyValuePair_free(KeyValuePair p);
//func to clear KVP array
// func to clear KVP array
void Autoarr_KeyValuePair_clear(Autoarr_KeyValuePair* ar);
void printkvp(KeyValuePair p);

4
Hashtable/hash.h
View File

@ -6,9 +6,9 @@ extern "C" {
#include "../base/base.h"
//djb2 hash function from http://www.cse.yorku.ca/~oz/hash.html
// djb2 hash function from http:// www.cse.yorku.ca/~oz/hash.html
uint32 ihash(char *str);
//sdbm hash function
// sdbm hash function
uint64 lhash(char* str);
#if __cplusplus

2
Makefile
View File

@ -3,7 +3,7 @@ TESTS=$(wildcard tests/*c) $(wildcard tests/**/*.c)
OUTDIR=bin
CMP=gcc
all: build_test
all: clear_c build_lib
clear_c:
clear

2
SearchTree/SearchTree.h
View File

@ -7,7 +7,7 @@ extern "C" {
#include "../base/base.h"
typedef struct SearchTreeNode{
struct SearchTreeNode**** branches; //*STNode[8][8][4]
struct SearchTreeNode**** branches; // *STNode[8][8][4]
Unitype value;
} STNode;

2
base/base.h
View File

@ -10,7 +10,7 @@ extern "C" {
#include "mystr.h"
// executes codeblock and prints execution time
#ifdef CLOCK_REALTIME //non-standard high-precision clock
#ifdef CLOCK_REALTIME // non-standard high-precision clock
#define optime(opname,repeats,codeblock) ({\
struct timespec start, stop;\
clock_gettime(CLOCK_REALTIME, &start);\

2
base/errors.h
View File

@ -8,7 +8,7 @@ extern "C" {
#include "types.h"
typedef enum err_t {
SUCCESS, //not an error
SUCCESS, // not an error
ERR_MAXLENGTH, ERR_WRONGTYPE, ERR_WRONGINDEX, ERR_NOTIMPLEMENTED, ERR_NULLPTR, ERR_ENDOFSTR
} err_t;

16
base/mystr.c
View File

@ -1,13 +1,13 @@
#include "base.h"
//returns length of string (including \0)
// returns length of string (including \0)
uint32 cptr_length(char* str){
uint32 len=0;
while(*(str++)) len++;
return ++len;
}
//allocates new char[] and copies src there
// allocates new char[] and copies src there
char* cptr_copy(char* src){
uint32 len=cptr_length(src);
char* dst=malloc(len*sizeof(char));
@ -16,7 +16,7 @@ char* cptr_copy(char* src){
return dst;
}
//compares two char buffers, NullPtr-friendly
// compares two char buffers, NullPtr-friendly
bool cptr_compare(char* key0, char* key1){
if(!key0) return key1 ? false : true;
if(!key1) return false;
@ -26,7 +26,7 @@ bool cptr_compare(char* key0, char* key1){
return true;
}
//multiplies char n times
// multiplies char n times
char* char_multiply(char c, uint32 n){
char* rez=malloc(n+1);
rez[n]=0;
@ -35,7 +35,7 @@ char* char_multiply(char c, uint32 n){
return rez;
}
//copies str content to new char pointer value (adding '\0' at the end)
// copies str content to new char pointer value (adding '\0' at the end)
char* string_cpToCptr(string str){
if(str.length==0) return NULL;
char* cptr=malloc(str.length*sizeof(char)+1);
@ -45,7 +45,7 @@ char* string_cpToCptr(string str){
return cptr;
}
//copies cptr content (excluding '\0' at the end) to new string
// copies cptr content (excluding '\0' at the end) to new string
string string_cpFromCharPtr(char* cptr){
if(!cptr) return stringNull;
string str;
@ -56,7 +56,7 @@ string string_cpFromCharPtr(char* cptr){
return str;
}
//compares two strings, NullPtr-friendly
// compares two strings, NullPtr-friendly
bool string_compare(string str0, string str1){
if(str0.length!=str1.length) return false;
if(!str0.ptr) return str1.ptr ? false : true;
@ -67,7 +67,7 @@ bool string_compare(string str0, string str1){
return true;
}
//creates new string which is reversed variant of <s>
// creates new string which is reversed variant of <s>
string string_reverse(string s){
if(s.length==0) return s;
string r={malloc(s.length), s.length};

24
base/mystr.h
View File

@ -6,37 +6,37 @@ extern "C" {
#include "types.h"
//returns length of string (including \0)
// returns length of string (including \0)
uint32 cptr_length(char* str);
//allocates new char[] and copies src there
// allocates new char[] and copies src there
char* cptr_copy(char* src);
//compares two char buffers, NullPtr-friendly
// compares two char buffers, NullPtr-friendly
bool cptr_compare(char* key0, char* key1);
//multiplies char n times
// multiplies char n times
char* char_multiply(char c, uint32 n);
//my fixed length string struct
//doesn't store '\0' at the end
// my fixed length string struct
// doesn't store '\0' at the end
typedef struct string{
char* ptr; //char pointer
uint32 length; //amount of chars in ptr value
char* ptr; // char pointer
uint32 length; // amount of chars in ptr value
} string;
static const string stringNull={NULL,0};
//copies str content to new char pointer value (adding '\0' at the end)
// copies str content to new char pointer value (adding '\0' at the end)
char* string_cpToCptr(string str);
//copies cptr content (excluding '\0' at the end) to new string
// copies cptr content (excluding '\0' at the end) to new string
string string_cpFromCharPtr(char* cptr);
//compares two strings, NullPtr-friendly
// compares two strings, NullPtr-friendly
bool string_compare(string str0, string str1);
//creates new string which is reversed variant of <s>
// creates new string which is reversed variant of <s>
string string_reverse(string s);
#if __cplusplus

2
base/types.c
View File

@ -45,7 +45,7 @@ const char* my_type_name(my_type t){
}
}
//frees VoidPtr value or does nothing if type isn't pointer
// frees VoidPtr value or does nothing if type isn't pointer
void Unitype_free(Unitype u){
switch (u.type) {
case Null:

2
base/types.h
View File

@ -47,7 +47,7 @@ static const Unitype UniFalse={.Bool=false,.type=Bool};
#define Uni(TYPE,VAL) (Unitype){.type=TYPE,.TYPE=VAL}
#define UniPtr(TYPE,VAL) (Unitype){.type=TYPE,.VoidPtr=VAL}
//frees VoidPtr value or does nothing if type isn't pointer
// frees VoidPtr value or does nothing if type isn't pointer
void Unitype_free(Unitype u);
void printuni(Unitype v);
void sprintuni(char* s, Unitype v);

2
tests/main.c
View File

@ -13,7 +13,7 @@ void test_all(){
int main(){
setlocale(LC_ALL, "en-US.Unicode");
printf("\e[92mdtsod parser in c language!\e[97m\n");
optime("test_all",1,{test_all();});
optime("test_all",1,test_all());
printf("\e[0m\n");
return 0;
}