Implementing Scanner: macros and high-level functions.

1 files changed, 15 insertions, 5 deletions

diff --git a/include/yaml/yaml.h b/include/yaml/yaml.h
index 7ee6b28..6acbb54 100644
--- a/include/yaml/yaml.h
+++ b/include/yaml/yaml.h
@@ -537,9 +537,6 @@ typedef struct {
  */
 
 typedef struct {
-    /** Is a simple key possible? */
-    int possible;
-
     /** Is a simple key required? */
     int required;
 
@@ -585,6 +582,15 @@ typedef struct {
     /** The problematic value (@c -1 is none). */
     int problem_value;
 
+    /** The problem position. */
+    yaml_mark_t problem_mark;
+
+    /** The error context. */
+    const char *context;
+
+    /** The context position. */
+    yaml_mark_t context_mark;
+
     /**
      * @}
      */
@@ -661,7 +667,7 @@ typedef struct {
     int flow_level;
 
     /** The tokens queue, which contains the current produced tokens. */
-    yaml_token_t *tokens;
+    yaml_token_t **tokens;
 
     /** The size of the tokens queue. */
     size_t tokens_size;
@@ -691,7 +697,7 @@ typedef struct {
     int simple_key_allowed;
 
     /** The stack of potential simple keys. */
-    yaml_simple_key_t *simple_keys;
+    yaml_simple_key_t **simple_keys;
 
     /** The size of the simple keys stack. */
     size_t simple_keys_size;
@@ -853,6 +859,10 @@ yaml_realloc(void *ptr, size_t size);
 YAML_DECLARE(void)
 yaml_free(void *ptr);
 
+/** The initial size for various buffers. */
+
+#define YAML_DEFAULT_SIZE   16
+
 /** The size of the raw buffer. */
 
 #define YAML_RAW_BUFFER_SIZE 16384