Changeset 239 for libyaml/trunk/src/scanner.c

Timestamp:

01/07/07 17:51:10 (6 years ago)

Author:

xi

Message:

Add win32 fixes and project files for VC6.

File:

• libyaml/trunk/src/scanner.c (modified) (10 diffs)

libyaml/trunk/src/scanner.c

@@ -1104 +1104 @@
 
     int required = (!parser->flow_level
-            && parser->indent == parser->mark.column);
+            && parser->indent == (int)parser->mark.column);
 
     /*
@@ -1121 +1121 @@
         yaml_simple_key_t simple_key = { 1, required,
             parser->tokens_parsed + parser->tokens.tail - parser->tokens.head,
-            parser->mark };
+            { 0, 0, 0 } };
+        simple_key.mark = parser->mark;
 
         if (!yaml_parser_remove_simple_key(parser)) return 0;
@@ -2570 +2571 @@
     /* Resize the string to include the head. */
 
-    while (string.end - string.start <= length) {
+    while (string.end - string.start <= (int)length) {
         if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
             parser->error = YAML_MEMORY_ERROR;
@@ -2852 +2853 @@
     if (!CACHE(parser, 1)) goto error;
 
-    while (parser->mark.column == indent && !IS_Z(parser->buffer))
+    while ((int)parser->mark.column == indent && !IS_Z(parser->buffer))
     {
         /*
@@ -2959 +2960 @@
         if (!CACHE(parser, 1)) return 0;
 
-        while ((!*indent || parser->mark.column < *indent)
+        while ((!*indent || (int)parser->mark.column < *indent)
                 && IS_SPACE(parser->buffer)) {
             SKIP(parser);
@@ -2965 +2966 @@
         }
 
-        if (parser->mark.column > max_indent)
-            max_indent = parser->mark.column;
+        if ((int)parser->mark.column > max_indent)
+            max_indent = (int)parser->mark.column;
 
         /* Check for a tab character messing the intendation. */
 
-        if ((!*indent || parser->mark.column < *indent)
+        if ((!*indent || (int)parser->mark.column < *indent)
                 && IS_TAB(parser->buffer)) {
             return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
@@ -3099 +3100 @@
             else if (!single && CHECK(parser->buffer, '\\'))
             {
-                int code_length = 0;
+                size_t code_length = 0;
 
                 if (!STRING_EXTEND(parser, string)) goto error;
@@ -3208 +3209 @@
                 {
                     unsigned int value = 0;
-                    int k;
+                    size_t k;
 
                     /* Scan the character value. */
@@ -3496 +3497 @@
                 /* Check for tab character that abuse intendation. */
 
-                if (leading_blanks && parser->mark.column < indent
+                if (leading_blanks && (int)parser->mark.column < indent
                         && IS_TAB(parser->buffer)) {
                     yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
@@ -3534 +3535 @@
         /* Check intendation level. */
 
-        if (!parser->flow_level && parser->mark.column < indent)
+        if (!parser->flow_level && (int)parser->mark.column < indent)
             break;
     }