From 662cb7fc400c6c3cc763e5d79a58f770335baba9 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Apr 2022 23:03:20 +0300 Subject: [PATCH] comments with space --- Autoarr/Autoarr.c | 2 +- Autoarr/Autoarr.h | 2 +- DtsodParser/DtsodV24.c | 10 +++++----- DtsodParser/DtsodV24.h | 14 +++++++------- DtsodParser/DtsodV24_deserialize.c | 27 ++++++++++++++------------- DtsodParser/DtsodV24_exported.c | 18 +++++++++--------- DtsodParser/DtsodV24_serialize.c | 2 +- Hashtable/Hashtable.c | 2 +- Hashtable/Hashtable.h | 16 ++++++++-------- Hashtable/KeyValuePair.c | 4 ++-- Hashtable/KeyValuePair.h | 4 ++-- Hashtable/hash.h | 4 ++-- SearchTree/SearchTree.h | 2 +- StringFragment/StringBuilder.h | 2 +- StringFragment/StringFragment.c | 6 +++--- StringFragment/StringFragment.h | 10 +++++----- base/base.h | 4 ++-- base/cptr.c | 8 ++++---- base/cptr.h | 8 ++++---- base/errors.h | 2 +- base/types.c | 2 +- base/types.h | 2 +- 22 files changed, 76 insertions(+), 75 deletions(-) diff --git a/Autoarr/Autoarr.c b/Autoarr/Autoarr.c index e22daaf..d6ee333 100644 --- a/Autoarr/Autoarr.c +++ b/Autoarr/Autoarr.c @@ -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;blockIblocks_count-1;blockI++) for(uint32 elemI=0;elemImax_block_length;elemI++) diff --git a/Autoarr/Autoarr.h b/Autoarr/Autoarr.h index 5f12633..1ecacd3 100644 --- a/Autoarr/Autoarr.h +++ b/Autoarr/Autoarr.h @@ -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)({\ diff --git a/DtsodParser/DtsodV24.c b/DtsodParser/DtsodV24.c index 21b0984..f5ce5b4 100644 --- a/DtsodParser/DtsodV24.c +++ b/DtsodParser/DtsodV24.c @@ -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); } \ No newline at end of file diff --git a/DtsodParser/DtsodV24.h b/DtsodParser/DtsodV24.h index 26a116c..b36b610 100644 --- a/DtsodParser/DtsodV24.h +++ b/DtsodParser/DtsodV24.h @@ -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 diff --git a/DtsodParser/DtsodV24_deserialize.c b/DtsodParser/DtsodV24_deserialize.c index 686f8c5..980d4d2 100644 --- a/DtsodParser/DtsodV24_deserialize.c +++ b/DtsodParser/DtsodV24_deserialize.c @@ -6,13 +6,14 @@ #define STRB_BC 64 #define STRB_BL 1024 +// 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 without quotes +// returns part of without quotes Maybe __ReadString(DeserializeSharedData* shared){ char c; bool prevIsBackslash=false; @@ -111,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); } @@ -144,11 +145,11 @@ Maybe __ReadList(DeserializeSharedData* shared){ #define ReadList() __ReadList(shared) Maybe __ParseValue(DeserializeSharedData* shared, StringFragment str){ - //printf("\e[94m<\e[96m%s\e[94m>\n",StringFragment_extract(str)); + // printf("\e[94m<\e[96m%s\e[94m>\n",StringFragment_extract(str)); const StringFragment trueStr= {"true" ,0,4}; const StringFragment falseStr={"false",0,5}; switch(str.ptr[str.length-1]){ - //Bool + // Bool case 'e': { if(StringFragment_compare(str,trueStr)) return SUCCESS(UniTrue); @@ -156,14 +157,14 @@ Maybe __ParseValue(DeserializeSharedData* shared, StringFragment str){ return SUCCESS(UniFalse); else safethrow_wrongchar(*str.ptr); } - //Float64 + // Float64 case 'f': { char* _c=StringFragment_extract(str).ptr; Unitype rez=Uni(Float64,strtod(_c,NULL)); free(_c); return SUCCESS(rez); } - //UInt64 + // UInt64 case 'u': { uint64 lu=0; char* _c=StringFragment_extract(str).ptr; @@ -171,7 +172,7 @@ Maybe __ParseValue(DeserializeSharedData* shared, StringFragment str){ free(_c); return SUCCESS(Uni(UInt64,lu)); } - //Int64 + // Int64 case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': { int64 li=0; @@ -187,7 +188,7 @@ Maybe __ParseValue(DeserializeSharedData* shared, StringFragment str){ free(_c); return SUCCESS(Uni(Int64,li)); } - //unknown type + // unknown type default: safethrow_wrongchar(str.ptr[str.length-1]); } @@ -217,7 +218,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); @@ -233,7 +234,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 ';': @@ -267,7 +268,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) diff --git a/DtsodParser/DtsodV24_exported.c b/DtsodParser/DtsodV24_exported.c index 3ba9f31..1ffb67b 100644 --- a/DtsodParser/DtsodV24_exported.c +++ b/DtsodParser/DtsodV24_exported.c @@ -1,8 +1,8 @@ -// +// // I planned to export functions from DtsodV24.h, // but C# P/Invoke can't get returned values for some reason. // Following functions return values by pointer, which looks in C# like out parameter -// +// #if __cplusplus extern "C" { @@ -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); } diff --git a/DtsodParser/DtsodV24_serialize.c b/DtsodParser/DtsodV24_serialize.c index bf87775..fcc612d 100644 --- a/DtsodParser/DtsodV24_serialize.c +++ b/DtsodParser/DtsodV24_serialize.c @@ -1,7 +1,7 @@ #include "DtsodV24.h" #include "../StringFragment/StringBuilder.h" -//65536 max length! +// 65536 max length! #define STRB_BC 64 #define STRB_BL 1024 diff --git a/Hashtable/Hashtable.c b/Hashtable/Hashtable.c index 9f66450..7bddbb6 100644 --- a/Hashtable/Hashtable.c +++ b/Hashtable/Hashtable.c @@ -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); diff --git a/Hashtable/Hashtable.h b/Hashtable/Hashtable.h index 14714de..90ab0ac 100644 --- a/Hashtable/Hashtable.h +++ b/Hashtable/Hashtable.h @@ -9,35 +9,35 @@ 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} -// +// // don't add pairs with the same keys, // or something weird will happen -// +// 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); diff --git a/Hashtable/KeyValuePair.c b/Hashtable/KeyValuePair.c index c11ae9f..d07216e 100644 --- a/Hashtable/KeyValuePair.c +++ b/Hashtable/KeyValuePair.c @@ -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++) diff --git a/Hashtable/KeyValuePair.h b/Hashtable/KeyValuePair.h index 7f99dfb..afbc803 100644 --- a/Hashtable/KeyValuePair.h +++ b/Hashtable/KeyValuePair.h @@ -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); diff --git a/Hashtable/hash.h b/Hashtable/hash.h index b13db28..2f575c5 100644 --- a/Hashtable/hash.h +++ b/Hashtable/hash.h @@ -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 diff --git a/SearchTree/SearchTree.h b/SearchTree/SearchTree.h index d7ae5a9..4d83bb1 100644 --- a/SearchTree/SearchTree.h +++ b/SearchTree/SearchTree.h @@ -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; diff --git a/StringFragment/StringBuilder.h b/StringFragment/StringBuilder.h index 8dff2db..9369973 100644 --- a/StringFragment/StringBuilder.h +++ b/StringFragment/StringBuilder.h @@ -16,7 +16,7 @@ void StringBuilder_append_string(StringBuilder* b, StringFragment s); void StringBuilder_append_int64(StringBuilder* b, int64 a); void StringBuilder_append_uint64(StringBuilder* b, uint64 a); void StringBuilder_append_double(StringBuilder* b, double a); -//returns StringFragment with '\0' at the end +// returns StringFragment with '\0' at the end StringFragment StringBuilder_build(StringBuilder* b); #if __cplusplus diff --git a/StringFragment/StringFragment.c b/StringFragment/StringFragment.c index 4cb6f2b..b3c0ca7 100644 --- a/StringFragment/StringFragment.c +++ b/StringFragment/StringFragment.c @@ -1,6 +1,6 @@ #include "StringFragment.h" -//copies characters from to new StringFragment (adding '\0' at the end) +// copies characters from to new StringFragment (adding '\0' at the end) StringFragment StringFragment_extract(StringFragment str){ if(str.length==0) return stringNull; StringFragment extr={ @@ -15,7 +15,7 @@ StringFragment StringFragment_extract(StringFragment str){ return extr; } -//compares two strings, NullPtr-friendly +// compares two strings, NullPtr-friendly bool StringFragment_compare(StringFragment str0, StringFragment str1){ if(str0.length!=str1.length) return false; if(!str0.ptr) return str1.ptr ? false : true; @@ -28,7 +28,7 @@ bool StringFragment_compare(StringFragment str0, StringFragment str1){ return true; } -//creates new StringFragment which is reversed variant of +// creates new StringFragment which is reversed variant of StringFragment StringFragment_reverse(StringFragment s){ if(s.length==0) return s; StringFragment r={ diff --git a/StringFragment/StringFragment.h b/StringFragment/StringFragment.h index 9cfbcd4..9331413 100644 --- a/StringFragment/StringFragment.h +++ b/StringFragment/StringFragment.h @@ -6,22 +6,22 @@ extern "C" { #include "../base/base.h" -//part of string +// part of string typedef struct StringFragment{ - char* ptr; //may be without '\0' at the end + char* ptr; // may be without '\0' at the end uint32 offset; uint32 length; } StringFragment; static const StringFragment stringNull={NULL,0,0}; -//copies characters from to new StringFragment (adding '\0' at the end) +// copies characters from to new StringFragment (adding '\0' at the end) StringFragment StringFragment_extract(StringFragment str); -//compares two strings, NullPtr-friendly +// compares two strings, NullPtr-friendly bool StringFragment_compare(StringFragment str0, StringFragment str1); -//creates new StringFragment which is reversed variant of +// creates new StringFragment which is reversed variant of StringFragment StringFragment_reverse(StringFragment s); #if __cplusplus diff --git a/base/base.h b/base/base.h index b23b92d..4e2708e 100644 --- a/base/base.h +++ b/base/base.h @@ -10,7 +10,7 @@ extern "C" { #include "cptr.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);\ @@ -20,7 +20,7 @@ extern "C" { double t=(double)(stop.tv_sec-start.tv_sec+(double)(stop.tv_nsec-start.tv_nsec)/1000000000)/repeats;\ printf("\e[93moperation \e[94m%s\e[93m lasted \e[94m%lf \e[93mseconds\n",opname,t);\ }) -#else // +#else // standard clock which works worse then previous #define optime(opname,repeats,codeblock) ({\ clock_t start=clock();\ for(uint64 ___OPREP=0;___OPREP<(uint64)repeats;___OPREP++)\ diff --git a/base/cptr.c b/base/cptr.c index 0646b15..50dbcdf 100644 --- a/base/cptr.c +++ b/base/cptr.c @@ -1,13 +1,13 @@ #include "base.h" -//returns length of string (without \0) +// returns length of string (without \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)+1; char* dst=malloc(len); @@ -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; diff --git a/base/cptr.h b/base/cptr.h index 46f6679..93829fc 100644 --- a/base/cptr.h +++ b/base/cptr.h @@ -6,16 +6,16 @@ extern "C" { #include "types.h" -//returns length of string (without \0) +// returns length of string (without \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); #if __cplusplus diff --git a/base/errors.h b/base/errors.h index 88f63b0..309b060 100644 --- a/base/errors.h +++ b/base/errors.h @@ -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; diff --git a/base/types.c b/base/types.c index f0197c7..36504a7 100644 --- a/base/types.c +++ b/base/types.c @@ -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: diff --git a/base/types.h b/base/types.h index bbbf2f6..2ea0b48 100644 --- a/base/types.h +++ b/base/types.h @@ -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);