@@ -139,6 +139,10 @@ extern "C" { extern dfsch_object_t* dfsch_make_slot_accessor(dfsch_type_t* type, char* slot); + extern dfsch_object_t* dfsch_make_slot_reader(dfsch_type_t* type, + char* slot); + extern dfsch_object_t* dfsch_make_slot_writer(dfsch_type_t* type, + char* slot); /** Is OBJ null? */ dfsch/dfsch.h @@ -76,6 +76,10 @@ extern dfsch_type_t dfsch_writer_state_type; extern dfsch_type_t dfsch_slot_accessor_type; #define DFSCH_SLOT_ACCESSOR_TYPE (&dfsch_slot_accessor_type) +extern dfsch_type_t dfsch_slot_reader_type; +#define DFSCH_SLOT_READER_TYPE (&dfsch_slot_reader_type) +extern dfsch_type_t dfsch_slot_writer_type; +#define DFSCH_SLOT_WRITER_TYPE (&dfsch_slot_writer_type) typedef struct dfsch_primitive_t { dfsch/types.h @@ -17,4 +17,12 @@ extern void dfsch__generic_register(dfsch_object_t *ctx); extern void dfsch__bignum_register(dfsch_object_t* ctx); extern void dfsch__conditions_register(dfsch_object_t* ctx); +dfsch_object_t* dfsch__make_slot_accessor_for_slot(dfsch_type_t* type, + dfsch_slot_t* slot); +dfsch_object_t* dfsch__make_slot_reader_for_slot(dfsch_type_t* type, + dfsch_slot_t* slot); +dfsch_object_t* dfsch__make_slot_writer_for_slot(dfsch_type_t* type, + dfsch_slot_t* slot); + + #endif src/internal.h @@ -178,6 +178,26 @@ DFSCH_DEFINE_PRIMITIVE(make_slot_accessor, return dfsch_make_slot_accessor(type, name); } +DFSCH_DEFINE_PRIMITIVE(make_slot_reader, + "Create specialized slot reader function"){ + dfsch_type_t* type; + char* name; + DFSCH_TYPE_ARG(args, type); + DFSCH_SYMBOL_ARG(args, name); + DFSCH_ARG_END(args); + + return dfsch_make_slot_reader(type, name); +} +DFSCH_DEFINE_PRIMITIVE(make_slot_writer, + "Create specialized slot writer function"){ + dfsch_type_t* type; + char* name; + DFSCH_TYPE_ARG(args, type); + DFSCH_SYMBOL_ARG(args, name); + DFSCH_ARG_END(args); + + return dfsch_make_slot_writer(type, name); +} DFSCH_DEFINE_PRIMITIVE(get_list_annotation, @@ -990,6 +1010,10 @@ void dfsch__native_register(dfsch_object_t *ctx){ dfsch_defconst_cstr(ctx, "find-slot", DFSCH_PRIMITIVE_REF(find_slot)); dfsch_defconst_cstr(ctx, "make-slot-accessor", DFSCH_PRIMITIVE_REF(make_slot_accessor)); + dfsch_defconst_cstr(ctx, "make-slot-reader", + DFSCH_PRIMITIVE_REF(make_slot_reader)); + dfsch_defconst_cstr(ctx, "make-slot-writer", + DFSCH_PRIMITIVE_REF(make_slot_writer)); dfsch__native_cxr_register(ctx); src/native.c @@ -308,6 +308,103 @@ dfsch_object_t* dfsch_make_slot_accessor(dfsch_type_t* type, dfsch_find_slot(type, slot)); } +static dfsch_object_t* slot_reader_apply(slot_accessor_t* sa, + dfsch_object_t* args, + dfsch_tail_escape_t* esc, + dfsch_object_t* context){ + dfsch_object_t* instance; + dfsch_object_t* value; + DFSCH_OBJECT_ARG(args, instance); + DFSCH_ARG_END(args); + + instance = DFSCH_ASSERT_INSTANCE(instance, sa->instance_class); + + return dfsch_slot_ref(instance, sa->slot, 0); +} +static void slot_reader_write(slot_accessor_t* sa, + dfsch_writer_state_t* state){ + dfsch_write_unreadable(state, (dfsch_object_t*)sa, + "%s @ %s", sa->slot->name, sa->instance_class->name); +} + +dfsch_type_t dfsch_slot_reader_type = { + .type = DFSCH_STANDARD_TYPE, + .superclass = DFSCH_FUNCTION_TYPE, + .size = sizeof(slot_accessor_t), + .name = "slot-reader", + .apply = (dfsch_type_apply_t)slot_accessor_apply, + .write = (dfsch_type_write_t)slot_accessor_write, + .slots = slot_accessor_slots, + .documentation = "Slot reader allows direct reading of slot value" +}; + +dfsch_object_t* dfsch__make_slot_reader_for_slot(dfsch_type_t* type, + dfsch_slot_t* slot){ + slot_accessor_t* sa = + (slot_accessor_t*) dfsch_make_object(DFSCH_SLOT_READER_TYPE); + + sa->instance_class = type; + sa->slot = slot; + return (dfsch_object_t*) sa; +} +dfsch_object_t* dfsch_make_slot_reader(dfsch_type_t* type, + char* slot){ + return dfsch__make_slot_reader_for_slot(type, + dfsch_find_slot(type, slot)); +} +static dfsch_object_t* slot_writer_apply(slot_accessor_t* sa, + dfsch_object_t* args, + dfsch_tail_escape_t* esc, + dfsch_object_t* context){ + dfsch_object_t* instance; + dfsch_object_t* value; + DFSCH_OBJECT_ARG(args, instance); + DFSCH_OBJECT_ARG_OPT(args, value, DFSCH_INVALID_OBJECT); + DFSCH_ARG_END(args); + + instance = DFSCH_ASSERT_INSTANCE(instance, sa->instance_class); + + if (value == DFSCH_INVALID_OBJECT){ + return dfsch_slot_ref(instance, sa->slot, 0); + } else { + dfsch_slot_set(instance, sa->slot, value, 0); + return value; + } +} + +static void slot_writer_write(slot_accessor_t* sa, + dfsch_writer_state_t* state){ + dfsch_write_unreadable(state, (dfsch_object_t*)sa, + "%s @ %s", sa->slot->name, sa->instance_class->name); +} + +dfsch_type_t dfsch_slot_writer_type = { + .type = DFSCH_STANDARD_TYPE, + .superclass = DFSCH_FUNCTION_TYPE, + .size = sizeof(slot_accessor_t), + .name = "slot-writer", + .apply = (dfsch_type_apply_t)slot_accessor_apply, + .write = (dfsch_type_write_t)slot_accessor_write, + .slots = slot_accessor_slots, + .documentation = "Slot writer allows direct modification of slot value" +}; + +dfsch_object_t* dfsch__make_slot_writer_for_slot(dfsch_type_t* type, + dfsch_slot_t* slot){ + slot_accessor_t* sa = + (slot_accessor_t*) dfsch_make_object(DFSCH_SLOT_WRITER_TYPE); + + sa->instance_class = type; + sa->slot = slot; + return (dfsch_object_t*) sa; +} +dfsch_object_t* dfsch_make_slot_writer(dfsch_type_t* type, + char* slot){ + return dfsch__make_slot_writer_for_slot(type, + dfsch_find_slot(type, slot)); +} + + dfsch_type_t dfsch_abstract_type = { DFSCH_META_TYPE, src/types.c b39edbfc30baed357089c77321863b853ee6d671 Ales Hakl ales@hakl.net http://github.com/adh/dfsch/commit/11dc5f869081d1109b8d4df7024641f11862184e 11dc5f869081d1109b8d4df7024641f11862184e 2009-11-15T18:07:48-08:00 2009-11-15T18:07:48-08:00 Support not only slot-accessors but also readers and writers f75622d1c17c9da70ce29f276f5afb7e31937e7a Ales Hakl ales@hakl.net