summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/function.h7
-rw-r--r--src/core/garbage.c5
-rw-r--r--src/core/interpret.c3
-rw-r--r--src/core/scanner.c12
-rw-r--r--src/core/token.c9
-rw-r--r--src/core/token.h3
-rw-r--r--src/data/hash.c3
-rw-r--r--src/data/hash.h4
-rw-r--r--src/data/list.c7
-rw-r--r--src/data/list.h16
-rw-r--r--src/data/map.c12
-rw-r--r--src/data/map.h12
-rw-r--r--src/data/tree.c4
-rw-r--r--src/defines.h2
14 files changed, 69 insertions, 30 deletions
diff --git a/src/core/function.h b/src/core/function.h
index 618ed94..70cf14c 100644
--- a/src/core/function.h
+++ b/src/core/function.h
@@ -43,8 +43,11 @@
void function_process(Interpret *p_interp, Token *p_token_op,
Token *p_token_op2, Stack *p_stack_args, int i_args);
_Bool function_is_buildin(Token *p_token_ident);
-void function_process_buildin(Interpret *p_interpret, Token *p_token_ident, Stack *p_stack_args);
+void function_process_buildin(Interpret *p_interpret,
+ Token *p_token_ident,
+ Stack *p_stack_args);
_Bool function_is_self_defined(Interpret *p_interpret);
-void function_process_self_defined(Interpret *p_interpret, Token *p_token_ident);
+void function_process_self_defined(Interpret *p_interpret,
+ Token *p_token_ident);
#endif /* FUNCTION_H */
diff --git a/src/core/garbage.c b/src/core/garbage.c
index 1ba6831..1533f60 100644
--- a/src/core/garbage.c
+++ b/src/core/garbage.c
@@ -56,8 +56,9 @@ void
garbage_destroy() {
garbage_collect();
if (!list_empty(LIST_GARBAGE)) {
- EPRINTF("The garbage collector still has %d registered items which don't have"
- " a zero ref count!\n", list_size(LIST_GARBAGE));
+ EPRINTF("The garbage collector still has %d registered items "
+ " which don't have a zero ref count!\n",
+ list_size(LIST_GARBAGE));
/*
ListIterator *p_iter = listiterator_new(LIST_GARBAGE);
diff --git a/src/core/interpret.c b/src/core/interpret.c
index 1b388d3..37702de 100644
--- a/src/core/interpret.c
+++ b/src/core/interpret.c
@@ -594,7 +594,8 @@ _control(Interpret *p_interpret) {
*/
} else {
- _INTERPRET_ERROR("Expected expression after control keyword", p_token);
+ _INTERPRET_ERROR("Expected expression after control keyword",
+ p_token);
}
listiterator_delete(p_interpret->p_iter);
diff --git a/src/core/scanner.c b/src/core/scanner.c
index 49026c2..08be550 100644
--- a/src/core/scanner.c
+++ b/src/core/scanner.c
@@ -160,7 +160,8 @@ _scanner_get_next_char(Scanner *p_scanner) {
void
scanner_run(Fype *p_fype) {
- Scanner *p_scanner = scanner_new(p_fype->p_list_token, p_fype->p_tupel_argv);
+ Scanner *p_scanner = scanner_new(p_fype->p_list_token,
+ p_fype->p_tupel_argv);
int i_token_len = 0;
char *c_token = malloc(sizeof(char));
@@ -281,7 +282,8 @@ scanner_run(Fype *p_fype) {
} else {
for (int i = 0; i < p_scanner->i_num_tokenends; ++i) {
if (_TOKENENDS[i] == c) {
- scanner_add_token(p_scanner, &c_token, &i_token_len, tt_cur);
+ scanner_add_token(p_scanner, &c_token,
+ &i_token_len, tt_cur);
if (i < _ADD_SEMICOLON_INDEX)
_add_semicolon_to_list(p_scanner);
break;
@@ -336,8 +338,10 @@ scanner_add_token(Scanner *p_scanner, char **cc_token, int *p_token_len,
TokenType tt_cur) {
List *p_list_token = scanner_get_list_token(p_scanner);
- Token *p_token = token_new(*cc_token, tt_cur, p_scanner->i_current_line_nr,
- p_scanner->i_current_pos_nr, p_scanner->c_filename);
+ Token *p_token = token_new(*cc_token, tt_cur,
+ p_scanner->i_current_line_nr,
+ p_scanner->i_current_pos_nr,
+ p_scanner->c_filename);
list_add_back(p_list_token, p_token);
token_ref_up(p_token);
diff --git a/src/core/token.c b/src/core/token.c
index 4fb298e..a54d529 100644
--- a/src/core/token.c
+++ b/src/core/token.c
@@ -185,7 +185,8 @@ tt_get_name(TokenType tt_cur) {
}
Token*
-token_new(char *c_val, TokenType tt_cur, int i_line_nr, int i_pos_nr, char *c_filename) {
+token_new(char *c_val, TokenType tt_cur, int i_line_nr,
+ int i_pos_nr, char *c_filename) {
Token *p_token = token_new_dummy();
p_token->c_val = c_val;
@@ -340,7 +341,7 @@ token_delete(Token *p_token) {
if (token_ref_down(p_token) <= 0) {
if (p_token->i_ref_count == 0) {
#ifdef DEBUG_TOKEN_REFCOUNT
- printf("DEBUG::TOKEN::REFCOUNT: Token refcount debug: Token ref count is 0 == %d\n",
+ printf("DEBUG::TOKEN::REFCOUNT: Token ref count is 0 == %d\n",
p_token->i_ref_count);
#endif /* DEBUG_TOKEN_REFCOUNT */
if (p_token->c_val)
@@ -353,14 +354,14 @@ token_delete(Token *p_token) {
}
#ifdef DEBUG_TOKEN_REFCOUNT
else {
- printf("DEBUG::TOKEN::REFCOUNT: Token refcount debug: Token ref count is 0 > %d\n",
+ printf("DEBUG::TOKEN::REFCOUNT: Token ref count is 0 > %d\n",
p_token->i_ref_count);
}
#endif /* DEBUG_TOKEN_REFCOUNT */
}
#ifdef DEBUG_TOKEN_REFCOUNT
else {
- printf("Token refcount debug: Token ref count is 0 < %d\n",
+ printf("DEBUG::TOKEN::REFCOUNT: Token ref count is 0 < %d\n",
p_token->i_ref_count);
}
#endif /* DEBUG_TOKEN_REFCOUNT */
diff --git a/src/core/token.h b/src/core/token.h
index 2107dd2..fa20338 100644
--- a/src/core/token.h
+++ b/src/core/token.h
@@ -169,7 +169,8 @@ typedef struct {
Array *p_array;
} Token;
-Token* token_new(char *c_val, TokenType tt_cur, int i_line_nr, int i_pos_nr, char *c_filename);
+Token* token_new(char *c_val, TokenType tt_cur, int i_line_nr,
+ int i_pos_nr, char *c_filename);
Token* token_new_integer(int i_val);
Token* token_new_couble(double d_val);
Token* token_new_string(char *c_val);
diff --git a/src/data/hash.c b/src/data/hash.c
index 5555eb1..5a80402 100644
--- a/src/data/hash.c
+++ b/src/data/hash.c
@@ -204,7 +204,8 @@ hash_nextaddr(Hash *p_hash, int i_max_tries, char *c_key, int i_addr,
void
hash_print(Hash *p_hash) {
- printf("hash_print [size:%d,cur:%d] syntax (flag[,key][=TYPE[<val>]]):\n -> ",
+ printf("hash_print [size:%d,cur:%d] syntax "
+ " (flag[,key][=TYPE[<val>]]):\n -> ",
p_hash->i_size,p_hash->i_cur_size);
for (int i = 0; i < p_hash->i_size; ++i) {
diff --git a/src/data/hash.h b/src/data/hash.h
index 196c4a8..4397d7c 100644
--- a/src/data/hash.h
+++ b/src/data/hash.h
@@ -71,7 +71,9 @@ RETCODE hash_size(Hash *p_hash, int i_size);
int hash_getaddr(Hash *p_hash, char *c_key, HASH_OP OP);
RETCODE hash_addrisfree(Hash *p_hash, int i_addr);
RETCODE hash_addrisocc(Hash *p_hash, int i_addr, char *c_key);
-int hash_nextaddr(Hash *p_hash, int i_max_tries, char *c_key, int i_addr, HASH_OP OP);
+int hash_nextaddr(Hash *p_hash, int i_max_tries,
+ char *c_key, int i_addr,
+ HASH_OP OP);
void hash_iterate(Hash *p_hash, void (*func)(void *));
#define hash_get_cur_size(hash) hash->i_cur_size
diff --git a/src/data/list.c b/src/data/list.c
index 83860c3..398dd37 100644
--- a/src/data/list.c
+++ b/src/data/list.c
@@ -271,7 +271,9 @@ list_iterate2_ptr(List *p_list, void (*func)(void *, void *), void *p_void) {
}
void
-list_iterate3(List *p_list, void (*func)(void *, void *, void *), void *p_void1, void *p_void2) {
+list_iterate3(List *p_list,
+ void (*func)(void *, void *, void *),
+ void *p_void1, void *p_void2) {
ListElem *p_elem = p_list->p_first;
while (p_elem) {
@@ -281,7 +283,8 @@ list_iterate3(List *p_list, void (*func)(void *, void *, void *), void *p_void1,
}
void
-list_iterate3_ptr(List *p_list, void (*func)(void *, void *, void *),
+list_iterate3_ptr(List *p_list,
+ void (*func)(void *, void *, void *),
void *p_void1, void *p_void2) {
ListElem *p_elem = p_list->p_first;
diff --git a/src/data/list.h b/src/data/list.h
index 323f496..1ed6635 100644
--- a/src/data/list.h
+++ b/src/data/list.h
@@ -84,10 +84,18 @@ void list_delete_cb(void *p_list);
void list_delete_and_free_vals(List *p_list);
unsigned list_size(List *p_list);
void list_iterate(List *p_list, void (*func)(void *));
-void list_iterate2_ptr(List *p_list, void (*func)(void *, void *), void *p_void);
-void list_iterate2(List *p_list, void (*func)(void *, void *), void *p_void);
-void list_iterate3(List *p_list, void (*func)(void *, void *, void *), void *p_void1, void *p_void2);
-void list_iterate3_ptr(List *p_list, void (*func)(void *, void *, void *), void *p_void1, void *p_void2);
+void list_iterate2_ptr(List *p_list,
+ void (*func)(void *, void *),
+ void *p_void);
+void list_iterate2(List *p_list,
+ void (*func)(void *, void *),
+ void *p_void);
+void list_iterate3(List *p_list,
+ void (*func)(void *, void *, void *),
+ void *p_void1, void *p_void2);
+void list_iterate3_ptr(List *p_list,
+ void (*func)(void *, void *, void *),
+ void *p_void1, void *p_void2);
ListIterator *listiterator_new(List *p_list);
ListIterator *listiterator_new_reverse(List *p_list);
void listiterator_delete(ListIterator *p_iter);
diff --git a/src/data/map.c b/src/data/map.c
index b5c016e..bc74f31 100644
--- a/src/data/map.c
+++ b/src/data/map.c
@@ -261,21 +261,27 @@ map_iterate2(Map *p_map, void (*func) (void *, void *), void *p_void) {
}
void
-map_iterate2_keys(Map *p_map, void (*func) (void *, void *, char *), void *p_void) {
+map_iterate2_keys(Map *p_map,
+ void (*func) (void *, void *, char *),
+ void *p_void) {
for (int i = 0; i < p_map->i_max_size; ++i)
if (p_map->pc_keys[i] != NULL)
(*func) (p_map->pp_vals[i], p_void, p_map->pc_keys[i]);
}
void
-map_iterate3(Map *p_map, void (*func) (void *, void *, void *), void *p_void1, void *p_void2) {
+map_iterate3(Map *p_map,
+ void (*func) (void *, void *, void *),
+ void *p_void1, void *p_void2) {
for (int i = 0; i < p_map->i_max_size; ++i)
if (p_map->pc_keys[i] != NULL)
(*func) (p_map->pp_vals[i], p_void1, p_void2);
}
void
-map_iterate3_keys(Map *p_map, void (*func) (void *, void *, void *, char *), void *p_void1, void *p_void2) {
+map_iterate3_keys(Map *p_map,
+ void (*func) (void *, void *, void *, char *),
+ void *p_void1, void *p_void2) {
for (int i = 0; i < p_map->i_max_size; ++i)
if (p_map->pc_keys[i] != NULL)
(*func) (p_map->pp_vals[i], p_void1, p_void2, p_map->pc_keys[i]);
diff --git a/src/data/map.h b/src/data/map.h
index fe7397f..144ffbd 100644
--- a/src/data/map.h
+++ b/src/data/map.h
@@ -72,9 +72,15 @@ void map_print(Map *p_map);
void map_iterate(Map *p_map, void (*func) (void *));
void map_iterate_keys(Map *p_map, void (*func) (void *, char *));
void map_iterate2(Map *p_map, void (*func) (void *, void *), void *p_void);
-void map_iterate2_keys(Map *p_map, void (*func) (void *, void *, char *), void *p_void);
-void map_iterate3(Map *p_map, void (*func) (void *, void *, void *), void *p_void1, void *p_void2);
-void map_iterate3_keys(Map *p_map, void (*func) (void *, void *, void *, char *), void *p_void1, void *p_void2);
+void map_iterate2_keys(Map *p_map,
+ void (*func) (void *, void *, char *),
+ void *p_void);
+void map_iterate3(Map *p_map,
+ void (*func) (void *, void *, void *),
+ void *p_void1, void *p_void2);
+void map_iterate3_keys(Map *p_map,
+ void (*func) (void *, void *, void *, char *),
+ void *p_void1, void *p_void2);
#define map_get_size(map) map->i_size
#define map_get_max_size(map) map->i_max_size
diff --git a/src/data/tree.c b/src/data/tree.c
index 0160eb9..7b4d303 100644
--- a/src/data/tree.c
+++ b/src/data/tree.c
@@ -126,7 +126,9 @@ _tree_print(TreeNode *p_treenode, int i_indent) {
#endif
printf("\nTree ");
- array_iterate2(p_treenode->p_array_childs, _tree_print_cb2, (void*) (i_indent + TREE_PRINT_INDENT));
+ array_iterate2(p_treenode->p_array_childs,
+ _tree_print_cb2,
+ (void*) (i_indent + TREE_PRINT_INDENT));
}
void
diff --git a/src/defines.h b/src/defines.h
index 75d396b..9da9886 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -42,7 +42,7 @@
#include "build.h"
-#define COPYRIGHT "Copyright by Paul C. Buetow (2005 - 2008) <fype@dev.buetow.org>"
+#define COPYRIGHT "(c) Paul C. Buetow (2005 - 2008) <fype@dev.buetow.org>"
#define FYPE
#define GRAMMAR_MAP_SIZES 128
#define ARRAY_SIZE 16