Changeset 317 for trunk/ext

Timestamp:

05/22/2008 16:28:58 (6 months ago)

Author:

slact

Message:

updated to latest flavor of Io (2008ish). Dump still badly broken.

Location:

trunk/ext/io/YAML

Files:

• build.io (modified) (1 diff)
• source/IoYAML.c (modified) (9 diffs)
• source/IoYAMLInit.c (added)

trunk/ext/io/YAML/build.io

@@ -1 @@
-Binding clone do(
+AddonBuilder clone do(
         dependsOnLib("syck")
-        setIsServerBinding(true)
 )

trunk/ext/io/YAML/source/IoYAML.c

@@ -14 +14 @@
 #include "IoMap.h"
 #include "IoSeq.h"
-#include "ByteArray.h"
+#include "UArray.h"
 
 #define DATA(self) ((IoYAMLData *)IoObject_dataPointer(self))
 
-IoTag *IoYAML_tag(void *state)
+IoTag *IoYAML_newTag(void *state)
 {
         IoTag *tag = IoTag_newWithName_("YAML");
-        tag->state = state;
-        tag->cloneFunc = (TagCloneFunc *)IoYAML_rawClone;
-        tag->freeFunc = (TagFreeFunc *)IoYAML_free;
-        tag->markFunc = (TagMarkFunc *)IoYAML_mark;
+        IoTag_state_(tag, state);
+        IoTag_cloneFunc_(tag, (IoTagCloneFunc *)IoYAML_rawClone);
+        IoTag_freeFunc_(tag, (IoTagFreeFunc *)IoYAML_free);
+        IoTag_markFunc_(tag, (IoTagMarkFunc *)IoYAML_mark);
         return tag;
 }
@@ -31 +31 @@
 {
         IoObject *self = IoObject_new(state);
-        self->tag = IoYAML_tag(state);
+        //self->tag = IoYAML_tag(state);
+        IoObject_tag_(self, IoYAML_newTag(state));
         
         IoObject_setDataPointer_(self, calloc(1, sizeof(IoYAMLData)));
@@ -81 +82 @@
 }
 
-SYMID
-IoYAML_parseHandler(SyckParser *p, SyckNode *n)
+SYMID IoYAML_parseHandler(SyckParser *p, SyckNode *n)
 {
   IoYAML *self = (IoYAML *)p->bonus;
@@ -148 +148 @@
 
                 case syck_seq_kind:
-      o = IoList_new(self->state);
+      o = IoList_new(IOSTATE);
                         for ( i=0; i < n->data.list->idx; i++ )
                         {
@@ -158 +158 @@
 
                 case syck_map_kind:
-      o = IoMap_new(self->state);
+      o = IoMap_new(IOSTATE);
                         for ( i=0; i < n->data.pairs->idx; i++ )
                         {
@@ -208 +208 @@
 typedef struct {
   IoYAML *self;
-  ByteArray *buffer;
+  UArray *buffer;
 } IoYAMLout;
 
-void
-IoYAML_emitHandler(SyckEmitter *e, st_data_t data)
+static void IoYAML_emitHandler(SyckEmitter *e, st_data_t data)
 {
         IoYAMLout *out = (IoYAMLout *)e->bonus;
@@ -229 +228 @@
   else if (ISSEQ(obj))
   {
-    syck_emit_scalar(e, "string", scalar_none, 0, 0, 0, (char *)IOSEQ_BYTES(obj), IOSEQ_LENGTH(obj));
+     if(!obj) {} else syck_emit_scalar(e, "string", scalar_none, 0, 0, 0, (char *)IOSEQ_BYTES(obj), IOSEQ_LENGTH(obj));
   }
   else if (ISNUMBER(obj))
@@ -265 +264 @@
 }
 
-void
-IoYAML_outputHandler(SyckEmitter *e, char *str, long len)
+void IoYAML_outputHandler(SyckEmitter *e, char *str, long len)
 {
         IoYAMLout *out = (IoYAMLout *)e->bonus;
-  ByteArray_appendBytes_size_(out->buffer, str, len);
+  UArray_appendBytes_size_(out->buffer, str, len);
 }
 
 IoObject *IoYAML_dump(IoYAML *self, IoObject *locals, IoMessage *m)
 {
-  ByteArray *buffer = ByteArray_new();
+  UArray *buffer = UArray_new();
         IoObject *obj = IoMessage_locals_valueArgAt_(m, locals, 0);
         SyckEmitter *emitter = syck_new_emitter();
@@ -289 +287 @@
   S_FREE(out);
 
-  return IoSeq_newWithByteArray_copy_(self->state, buffer, 0);
-}
+  return IoSeq_newWithUArray_copy_(IOSTATE, buffer, 0);
+}