summaryrefslogtreecommitdiffstats
path: root/dimension
diff options
context:
space:
mode:
Diffstat (limited to 'dimension')
-rw-r--r--dimension/parse.c4
-rw-r--r--dimension/realize.c8
-rw-r--r--dimension/tokenize.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/dimension/parse.c b/dimension/parse.c
index 198a4b8..99cda05 100644
--- a/dimension/parse.c
+++ b/dimension/parse.c
@@ -65,7 +65,7 @@ void dmnsn_pop_scope(dmnsn_symbol_table *symtable)
{
dmnsn_dictionary *scope;
dmnsn_array_pop(symtable, &scope);
- dmnsn_dictionary_apply(scope, &dmnsn_delete_symbol_table_entry);
+ dmnsn_dictionary_apply(scope, dmnsn_delete_symbol_table_entry);
dmnsn_delete_dictionary(scope);
}
@@ -274,7 +274,7 @@ dmnsn_delete_astnode(dmnsn_astnode astnode)
if (*astnode.refcount <= 1) {
dmnsn_delete_astree(astnode.children);
if (astnode.free_fn) {
- (*astnode.free_fn)(astnode.ptr);
+ astnode.free_fn(astnode.ptr);
} else {
dmnsn_free(astnode.ptr);
}
diff --git a/dimension/realize.c b/dimension/realize.c
index aef8417..019011e 100644
--- a/dimension/realize.c
+++ b/dimension/realize.c
@@ -1254,7 +1254,7 @@ dmnsn_realize_csg(dmnsn_astnode astnode, dmnsn_astnode modifiers,
dmnsn_array_push(lights, &light);
} else {
dmnsn_object *object = dmnsn_realize_object(*onode, lights);
- csg = (*csg_object_fn)(csg, object);
+ csg = csg_object_fn(csg, object);
}
}
@@ -1268,7 +1268,7 @@ dmnsn_realize_intersection(dmnsn_astnode astnode, dmnsn_astnode modifiers,
dmnsn_assert(astnode.type == DMNSN_AST_INTERSECTION,
"Expected an intersection.");
return dmnsn_realize_csg(astnode, modifiers, lights,
- &dmnsn_new_csg_intersection);
+ dmnsn_new_csg_intersection);
}
static dmnsn_object *
@@ -1277,7 +1277,7 @@ dmnsn_realize_difference(dmnsn_astnode astnode, dmnsn_astnode modifiers,
{
dmnsn_assert(astnode.type == DMNSN_AST_DIFFERENCE, "Expected a difference.");
return dmnsn_realize_csg(astnode, modifiers, lights,
- &dmnsn_new_csg_difference);
+ dmnsn_new_csg_difference);
}
static dmnsn_object *
@@ -1285,7 +1285,7 @@ dmnsn_realize_merge(dmnsn_astnode astnode, dmnsn_astnode modifiers,
dmnsn_array *lights)
{
dmnsn_assert(astnode.type == DMNSN_AST_MERGE, "Expected a merge.");
- return dmnsn_realize_csg(astnode, modifiers, lights, &dmnsn_new_csg_merge);
+ return dmnsn_realize_csg(astnode, modifiers, lights, dmnsn_new_csg_merge);
}
/* Realize an object, or maybe a light */
diff --git a/dimension/tokenize.c b/dimension/tokenize.c
index be6ce84..ced6fe5 100644
--- a/dimension/tokenize.c
+++ b/dimension/tokenize.c
@@ -752,7 +752,7 @@ dmnsn_declare_macro(int token, dmnsn_token_buffer *prev,
prev->auto_delete = true;
mnode->ptr = tbuffer;
- mnode->free_fn = &dmnsn_delete_token_buffer;
+ mnode->free_fn = dmnsn_delete_token_buffer;
return true;
}