Changeset 180

Timestamp:

05/29/06 16:08:09 (2 years ago)

Author:

xi

Message:

Working on the decoding code.

Files:

• libyaml/trunk/include/yaml/yaml.h (modified) (6 diffs)
• libyaml/trunk/src/api.c (modified) (8 diffs)
• libyaml/trunk/src/reader.c (modified) (3 diffs)

libyaml/trunk/include/yaml/yaml.h

@@ -253 +253 @@
- * buffer.  The number of written bytes should be set to the @a length variable.
- *
-ext 
+data
- *                          @c yaml_parser_set_read_handler.
- * @param[out]  buffer      The buffer to write the data from the source.
@@ -263 +263 @@
- * @a length to @c 0 and return @c 1.
- */
-
+
+
-        size_t *size_read);
+
+/**
+ * This structure holds a string input specified by
+ * @c yaml_parser_set_input_string.
+ */
+
+typedef struct {
+    unsigned char *start;
+    unsigned char *end;
+    unsigned char *current;
+} yaml_string_input_t;
-
-/**
@@ -280 +292 @@
-     */
-
-
+yaml_
-
-    /**
@@ -303 +315 @@
-    yaml_char_t *buffer;
-
-size of the buffer (in bytes)
-size_t buffer_size
+pointer to the end of the working buffer
+yaml_char_t *buffer_end
-
-    /** The pointer to the current character in the working buffer. */
-buffer_
-
-buffer (in characters)
-buffer_length
-
-remaining undecoded characters
+
+
+working buffer
+unread
+
+pointer to the beginning of the raw buffer
-    unsigned char *raw_buffer;
-
-size of the raw buffer (in bytes)
-size_t raw_buffer_size
-
-Is the application responsible for freeing the raw buffer?
-int raw_buffer_foreign
+pointer to the current character in the raw buffer
+unsigned char *raw_pointer
+
+The number of unread bytes in the raw buffer.
+size_t raw_unread
-
-    /** The input encoding. */
@@ -335 +347 @@
-    /** The column of the current position (starting from @c 0). */
-    size_t column;
+
+    /* String input structure. */
+    yaml_string_input_t string_input;
-
-    /**
@@ -462 +477 @@
-yaml_free(void *ptr);
-
+/** The size of the raw buffer. */
+
+#define YAML_RAW_BUFFER_SIZE 16384
+
+/**
+ * The size of the buffer.
+ *
+ * We allocate enough space for decoding the whole raw buffer.
+ */
+
+#define YAML_BUFFER_SIZE    (YAML_RAW_BUFFER_SIZE*3)
+
-/** @} */
-

libyaml/trunk/src/api.c

@@ -47 +47 @@
-    yaml_parser_t *parser;
-
+    /* Allocate the parser structure. */
+
-    parser = yaml_malloc(sizeof(yaml_parser_t));
-    if (!parser) return NULL;
-
-    memset(parser, 0, sizeof(yaml_parser_t));
+
+    /* Allocate the raw buffer. */
+
+    parser->raw_buffer = yaml_malloc(YAML_RAW_BUFFER_SIZE);
+    if (!parser->raw_buffer) {
+        yaml_free(parser);
+        return NULL;
+    }
+    parser->raw_pointer = parser->raw_buffer;
+    parser->raw_unread = 0;
+
+    /* Allocate the character buffer. */
+
+    parser->buffer = yaml_malloc(YAML_BUFFER_SIZE);
+    if (!parser->buffer) {
+        yaml_free(parser->raw_buffer);
+        yaml_free(parser);
+        return NULL;
+    }
+    parser->buffer_end = parser->buffer;
+    parser->pointer = parser->buffer;
+    parser->unread = 0;
-
-    return parser;
@@ -65 +89 @@
-
-    yaml_free(parser->buffer);
-
-
+
-
-    memset(parser, 0, sizeof(yaml_parser_t));
@@ -74 +97 @@
-
-/*
- (always returns error)
+
- */
-
@@ -81 +104 @@
-        size_t *size_read)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return 1;
-}
@@ -93 +129 @@
-        size_t *size_read)
-{
-ext
-ext
+data
+data
-}
-
@@ -106 +142 @@
-{
-    assert(parser); /* Non-NULL parser object expected. */
-er);
+_handler); 
-    assert(input);  /* Non-NULL input string expected. */
-
+    parser->string_input.start = input;
+    parser->string_input.current = input;
+    parser->string_input.end = input+size;
+
-    parser->read_handler = yaml_string_read_handler;
-
-
-
-
-
-
+
-}
-
@@ -126 +161 @@
-{
-    assert(parser); /* Non-NULL parser object expected. */
-er);
+_handler); 
-    assert(file);   /* Non-NULL file object expected. */
-
@@ -142 +177 @@
-{
-    assert(parser); /* Non-NULL parser object expected. */
-er);
+_handler); 
-    assert(handler);    /* Non-NULL read handler expected. */
-
-    parser->read_handler = handler;
-
+;
-}
-

libyaml/trunk/src/reader.c

@@ -1 +1 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
- * Ensure that the buffer contains at least length characters.
- * Return 1 on success, 0 on failure.
+ *
+ * The length is supposed to be significantly less that the buffer size.
- */
-
-int
-read
+buff
-{
-    /* If the EOF flag is set, do nothing. */
@@ -17 +69 @@
-        return 1;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    if (!parser->encoding) {
@@ -46 +81 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+