Chicken/toml
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #40 from gotnone/const

Browse source 
Add const qualifiers for access functions
This commit is contained in:
CK Tan 2020-07-07 22:15:40 -07:00 committed by GitHub
commit a94dbebc17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
toml.c
View file

@ -1728,7 +1728,7 @@ static tokentype_t next_token(context_t* ctx, int dotisspecial)
} }
const char* toml_key_in(toml_table_t* tab, int keyidx) const char* toml_key_in(const toml_table_t* tab, int keyidx)
{ {
if (keyidx < tab->nkval) return tab->kval[keyidx]->key; if (keyidx < tab->nkval) return tab->kval[keyidx]->key;
@ -1742,7 +1742,7 @@ const char* toml_key_in(toml_table_t* tab, int keyidx)
} }
const char* toml_raw_in(toml_table_t* tab, const char* key) const char* toml_raw_in(const toml_table_t* tab, const char* key)
{ {
int i; int i;
for (i = 0; i < tab->nkval; i++) { for (i = 0; i < tab->nkval; i++) {
@ -1752,7 +1752,7 @@ const char* toml_raw_in(toml_table_t* tab, const char* key)
return 0; return 0;
} }
toml_array_t* toml_array_in(toml_table_t* tab, const char* key) toml_array_t* toml_array_in(const toml_table_t* tab, const char* key)
{ {
int i; int i;
for (i = 0; i < tab->narr; i++) { for (i = 0; i < tab->narr; i++) {
@ -1763,7 +1763,7 @@ toml_array_t* toml_array_in(toml_table_t* tab, const char* key)
} }
toml_table_t* toml_table_in(toml_table_t* tab, const char* key) toml_table_t* toml_table_in(const toml_table_t* tab, const char* key)
{ {
int i; int i;
for (i = 0; i < tab->ntab; i++) { for (i = 0; i < tab->ntab; i++) {
@ -1773,7 +1773,7 @@ toml_table_t* toml_table_in(toml_table_t* tab, const char* key)
return 0; return 0;
} }
const char* toml_raw_at(toml_array_t* arr, int idx) const char* toml_raw_at(const toml_array_t* arr, int idx)
{ {
if (arr->kind != 'v') if (arr->kind != 'v')
return 0; return 0;
@ -1782,12 +1782,12 @@ const char* toml_raw_at(toml_array_t* arr, int idx)
return arr->u.val[idx]; return arr->u.val[idx];
} }
char toml_array_kind(toml_array_t* arr) char toml_array_kind(const toml_array_t* arr)
{ {
return arr->kind; return arr->kind;
} }
char toml_array_type(toml_array_t* arr) char toml_array_type(const toml_array_t* arr)
{ {
if (arr->kind != 'v') if (arr->kind != 'v')
return 0; return 0;
@ -1799,37 +1799,37 @@ char toml_array_type(toml_array_t* arr)
} }
int toml_array_nelem(toml_array_t* arr) int toml_array_nelem(const toml_array_t* arr)
{ {
return arr->nelem; return arr->nelem;
} }
const char* toml_array_key(toml_array_t* arr) const char* toml_array_key(const toml_array_t* arr)
{ {
return arr ? arr->key : (const char*) NULL; return arr ? arr->key : (const char*) NULL;
} }
int toml_table_nkval(toml_table_t* tab) int toml_table_nkval(const toml_table_t* tab)
{ {
return tab->nkval; return tab->nkval;
} }
int toml_table_narr(toml_table_t* tab) int toml_table_narr(const toml_table_t* tab)
{ {
return tab->narr; return tab->narr;
} }
int toml_table_ntab(toml_table_t* tab) int toml_table_ntab(const toml_table_t* tab)
{ {
return tab->ntab; return tab->ntab;
} }
const char* toml_table_key(toml_table_t* tab) const char* toml_table_key(const toml_table_t* tab)
{ {
return tab ? tab->key : (const char*) NULL; return tab ? tab->key : (const char*) NULL;
} }
toml_array_t* toml_array_at(toml_array_t* arr, int idx) toml_array_t* toml_array_at(const toml_array_t* arr, int idx)
{ {
if (arr->kind != 'a') if (arr->kind != 'a')
return 0; return 0;
@ -1838,7 +1838,7 @@ toml_array_t* toml_array_at(toml_array_t* arr, int idx)
return arr->u.arr[idx]; return arr->u.arr[idx];
} }
toml_table_t* toml_table_at(toml_array_t* arr, int idx) toml_table_t* toml_table_at(const toml_array_t* arr, int idx)
{ {
if (arr->kind != 't') if (arr->kind != 't')
return 0; return 0;

32
toml.h
View file

@ -58,45 +58,47 @@ TOML_EXTERN toml_table_t* toml_parse(char* conf, /* NUL terminated, please. */
TOML_EXTERN void toml_free(toml_table_t* tab); TOML_EXTERN void toml_free(toml_table_t* tab);
/* Retrieve the key in table at keyidx. Return 0 if out of range. */ /* Retrieve the key in table at keyidx. Return 0 if out of range. */
TOML_EXTERN const char* toml_key_in(toml_table_t* tab, int keyidx); TOML_EXTERN const char* toml_key_in(const toml_table_t* tab, int keyidx);
/* Lookup table by key. Return the element or 0 if not found. */ /* Lookup table by key. Return the element or 0 if not found. */
TOML_EXTERN const char* toml_raw_in(toml_table_t* tab, const char* key); TOML_EXTERN const char* toml_raw_in(const toml_table_t* tab, const char* key);
TOML_EXTERN toml_array_t* toml_array_in(toml_table_t* tab, const char* key); TOML_EXTERN toml_array_t* toml_array_in(const toml_table_t* tab,
TOML_EXTERN toml_table_t* toml_table_in(toml_table_t* tab, const char* key); const char* key);
TOML_EXTERN toml_table_t* toml_table_in(const toml_table_t* tab,
const char* key);
/* Return the array kind: 't'able, 'a'rray, 'v'alue */ /* Return the array kind: 't'able, 'a'rray, 'v'alue */
TOML_EXTERN char toml_array_kind(toml_array_t* arr); TOML_EXTERN char toml_array_kind(const toml_array_t* arr);
/* For array kind 'v'alue, return the type of values /* For array kind 'v'alue, return the type of values
i:int, d:double, b:bool, s:string, t:time, D:date, T:timestamp i:int, d:double, b:bool, s:string, t:time, D:date, T:timestamp
0 if unknown 0 if unknown
*/ */
TOML_EXTERN char toml_array_type(toml_array_t* arr); TOML_EXTERN char toml_array_type(const toml_array_t* arr);
/* Return the number of elements in the array */ /* Return the number of elements in the array */
TOML_EXTERN int toml_array_nelem(toml_array_t* arr); TOML_EXTERN int toml_array_nelem(const toml_array_t* arr);
/* Return the key of an array */ /* Return the key of an array */
TOML_EXTERN const char* toml_array_key(toml_array_t* arr); TOML_EXTERN const char* toml_array_key(const toml_array_t* arr);
/* Return the number of key-values in a table */ /* Return the number of key-values in a table */
TOML_EXTERN int toml_table_nkval(toml_table_t* tab); TOML_EXTERN int toml_table_nkval(const toml_table_t* tab);
/* Return the number of arrays in a table */ /* Return the number of arrays in a table */
TOML_EXTERN int toml_table_narr(toml_table_t* tab); TOML_EXTERN int toml_table_narr(const toml_table_t* tab);
/* Return the number of sub-tables in a table */ /* Return the number of sub-tables in a table */
TOML_EXTERN int toml_table_ntab(toml_table_t* tab); TOML_EXTERN int toml_table_ntab(const toml_table_t* tab);
/* Return the key of a table*/ /* Return the key of a table*/
TOML_EXTERN const char* toml_table_key(toml_table_t* tab); TOML_EXTERN const char* toml_table_key(const toml_table_t* tab);
/* Deref array by index. Return the element at idx or 0 if out of range. */ /* Deref array by index. Return the element at idx or 0 if out of range. */
TOML_EXTERN const char* toml_raw_at(toml_array_t* arr, int idx); TOML_EXTERN const char* toml_raw_at(const toml_array_t* arr, int idx);
TOML_EXTERN toml_array_t* toml_array_at(toml_array_t* arr, int idx); TOML_EXTERN toml_array_t* toml_array_at(const toml_array_t* arr, int idx);
TOML_EXTERN toml_table_t* toml_table_at(toml_array_t* arr, int idx); TOML_EXTERN toml_table_t* toml_table_at(const toml_array_t* arr, int idx);
/* Raw to String. Caller must call free(ret) after use. /* Raw to String. Caller must call free(ret) after use.