Changeset 179

Timestamp:

05/27/06 13:19:07 (2 years ago)

Author:

xi

Message:

Implementing Reader: first tries.

Files:

• libyaml/trunk/include/yaml/yaml.h (modified) (10 diffs)
• libyaml/trunk/src/Makefile.am (modified) (1 diff)
• libyaml/trunk/src/api.c (modified) (3 diffs)
• libyaml/trunk/src/reader.c (added)

libyaml/trunk/include/yaml/yaml.h

@@ -17 +17 @@
-
-#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
-
-/**
@@ -63 +65 @@
-} yaml_encoding_t;
-
-
-
-
-
+
-typedef enum {
-    YAML_NO_ERROR,
@@ -79 +78 @@
-    YAML_EMITTER_ERROR
-} yaml_error_type_t;
+
+/** @} */
+
+/*
-
-typedef enum {
@@ -250 +253 @@
- * buffer.  The number of written bytes should be set to the @a length variable.
- *
-
-
-
-
-length
+    
+    
+    
+    
+size_read 
- *
- * @returns On success, the handler should return @c 1.  If the handler failed,
@@ -260 +263 @@
- * @a length to @c 0 and return @c 1.
- */
-
-
-
+
+
-
-/**
@@ -272 +274 @@
-
-typedef struct {
+
+    /**
+     * @name Error handling
+     * @{
+     */
+
+    error_type_t error;
+
+    /**
+     * @}
+     */
-
-    /**
@@ -279 +292 @@
-
-    /** Read handler */
-
+_handl
-
-    /** A pointer for passing to the read handler. */
-er_ext
+_handler_data
-
-    /** EOF flag */
@@ -290 +303 @@
-    yaml_char_t *buffer;
-
+    /** The size of the buffer (in bytes). */
+    size_t buffer_size;
+
-    /** The pointer to the current character in the working buffer. */
-
+
+
+
+
-
-    /** The remaining undecoded characters. */
-    unsigned char *raw_buffer;
-
-
+ (in bytes)
-    size_t raw_buffer_size;
+
+    /** Is the application responsible for freeing the raw buffer? */
+    int raw_buffer_foreign;
-
-    /** The input encoding. */
-    yaml_encoding_t encoding;
+
+    /** The offset of the current position (in bytes). */
+    size_t offset;
+
+    /** The index of the current position (in characters). */
+    size_t index;
+
+    /** The line of the current position (starting from @c 0). */
+    size_t line;
+
+    /** The column of the current position (starting from @c 0). */
+    size_t column;
-
-    /**
@@ -329 +363 @@
-yaml_parser_delete(yaml_parser_t *parser);
-
+/**
+ * Set a string input.
+ *
+ * Note that the @a input pointer must be valid while the @a parser object
+ * exists.  The application is responsible for destroing @a input after
+ * destroying the @a parser.
+ *
+ * @param[in]   parser  A parser object.
+ * @param[in]   input   A source data.
+ * @param[in]   length  The length of the source data in bytes.
+ */
+
+void
+yaml_parser_set_input_string(yaml_parser_t *parser,
+        unsigned char *input, size_t size);
+
+
+/**
+ * Set a file input.
+ *
+ * @a file should be a file object open for reading.  The application is
+ * responsible for closing the @a file.
+ *
+ * @param[in]   parser  A parser object.
+ * @param[in]   file    An open file.
+ */
+
+void
+yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file);
+
+/**
+ * Set a generic input handler.
+ *
+ * @param[in]   parser  A parser object.
+ * @param[in]   handler A read handler.
+ * @param[in]   data    Any application data for passing to the read handler.
+ */
+
+void
+yaml_parser_set_input(yaml_parser_t *parser,
+        yaml_read_handler_t *handler, void *data);
+
+/**
+ * Set the source encoding.
+ *
+ * @param[in]   encoding    The source encoding.
+ */
+
+void
+yaml_parser_set_encoding(yaml_parser_t *parser, yaml_encoding_t encoding);
+
-/** @} */
-
@@ -335 +420 @@
-} yaml_emitter_t;
-*/
+
+/**
+ * @defgroup internal Internal Definitions
+ * @{
+ */
+
+/**
+ * Allocate a dynamic memory block.
+ *
+ * @param[in]   size    Size of a memory block, \c 0 is valid.
+ *
+ * @returns @c yaml_malloc returns a pointer to a newly allocated memory block,
+ * or @c NULL if it failed.
+ */
+
+void *
+yaml_malloc(size_t size);
+
+/**
+ * Reallocate a dynamic memory block.
+ *
+ * @param[in]   ptr     A pointer to an existing memory block, \c NULL is
+ *                      valid.
+ * @param[in]   size    A size of a new block, \c 0 is valid.
+ *
+ * @returns @c yaml_realloc returns a pointer to a reallocated memory block,
+ * or @c NULL if it failed.
+ */
+
+void *
+yaml_realloc(void *ptr, size_t size);
+
+/**
+ * Free a dynamic memory block.
+ *
+ * @param[in]   ptr     A pointer to an existing memory block, \c NULL is
+ *                      valid.
+ */
+
+void
+yaml_free(void *ptr);
+
+/** @} */
+
-
-#ifdef __cplusplus

libyaml/trunk/src/Makefile.am

@@ -1 +1 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-lib_LTLIBRARIES = libyaml.la
-
+ reader.c
-libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)

libyaml/trunk/src/api.c

@@ -6 +6 @@
-#include <yaml/yaml.h>
-
+#include <assert.h>
+
-/*
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
@@ -15 +47 @@
-    yaml_parser_t *parser;
-
-
+yaml_
-    if (!parser) return NULL;
-
@@ -30 +62 @@
-yaml_parser_delete(yaml_parser_t *parser)
-{
-
+
+
+
+
+
+
+
+
+
-}
-
+/*
+ * String read handler (always returns error).
+ */
+
+static int
+yaml_string_read_handler(void *data, unsigned char *buffer, size_t size,
+        size_t *size_read)
+{
+    *size_read = 0;
+    return 1;
+}
+
+/*
+ * File read handler.
+ */
+
+static int
+yaml_file_read_handler(void *data, unsigned char *buffer, size_t size,
+        size_t *size_read)
+{
+    *size_read = fread(buffer, 1, size, (FILE *)ext);
+    return !ferror((FILE *)ext);
+}
+
+/*
+ * Set a string input.
+ */
+
+void
+yaml_parser_set_input_string(yaml_parser_t *parser,
+        unsigned char *input, size_t size)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+    assert(!parser->reader); /* You can set the source only once. */
+    assert(input);  /* Non-NULL input string expected. */
+
+    parser->read_handler = yaml_string_read_handler;
+    parser->read_handler_data = NULL;
+
+    /* We use the input string as a raw (undecoded) buffer. */
+    parser->raw_buffer = input; 
+    parser->raw_buffer_size = size;
+    parser->raw_buffer_foreign = 1;
+}
+
+/*
+ * Set a file input.
+ */
+
+void
+yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+    assert(!parser->reader); /* You can set the source only once. */
+    assert(file);   /* Non-NULL file object expected. */
+
+    parser->read_handler = yaml_file_read_handler;
+    parser->read_handler_data = file;
+}
+
+/*
+ * Set a generic input.
+ */
+
+void
+yaml_parser_set_input(yaml_parser_t *parser,
+        yaml_read_handler_t *handler, void *data)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+    assert(!parser->reader); /* You can set the source only once. */
+    assert(handler);    /* Non-NULL read handler expected. */
+
+    parser->read_handler = handler;
+    parser->read_handler_data = data
+}
+
+/*
+ * Set the source encoding.
+ */
+
+void
+yaml_parser_set_encoding(yaml_parser_t *parser, yaml_encoding_t encoding)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+    assert(!parser->encoding); /* Encoding is already set or detected. */
+
+    parser->encoding = encoding;
+}
+