separate check kind between read and peek

Author: bbSnavy

src/buffer_io.c

@@ -92,8 +92,8 @@ t_ion_result_code ion_buffer_io_peek_kind(t_ion_buffer *self,
   return RESULT_OK;
 }
 
-t_ion_result_code ion_buffer_io_check_kind(t_ion_buffer *self,
-                                           t_ion_object_kind expected) {
+t_ion_result_code ion_buffer_io_read_check_kind(t_ion_buffer *self,
+                                                t_ion_object_kind expected) {
   t_ion_result_code result;
   t_ion_buffer_state *state;
   t_ion_buffer_state_io_entry **entry_ptr;
@@ -147,6 +147,61 @@ t_ion_result_code ion_buffer_io_check_kind(t_ion_buffer *self,
   return RESULT_OK;
 }
 
+t_ion_result_code ion_buffer_io_peek_check_kind(t_ion_buffer *self,
+                                                t_ion_object_kind expected) {
+  t_ion_result_code result;
+  t_ion_buffer_state *state;
+  t_ion_buffer_state_io_entry **entry_ptr;
+  t_ion_buffer_state_io_entry *entry;
+  t_ion_object_kind value;
+  uint8_t index;
+  uint8_t flag;
+
+  if (self == NULL)
+    return RESULT_ERROR;
+
+  state = self->state_p;
+  if (state->entry_level < 0) {
+    flag = true;
+  } else {
+    result =
+        vector_get(state->entry_list, (void **)&entry_ptr, state->entry_level);
+    if (result != RESULT_OK) {
+      return result;
+    }
+
+    entry = *entry_ptr;
+
+    switch (entry->kind) {
+    case ARR: {
+      flag = false;
+      break;
+    }
+
+    default: {
+      flag = true;
+      break;
+    }
+    }
+  }
+
+  if (!flag) {
+    return RESULT_OK;
+  }
+
+  result = ion_buffer_peek(self, &index, sizeof(index));
+  if (result != RESULT_OK) {
+    return result;
+  }
+
+  value = ion_object_kind_from_index(index);
+  if (value != expected) {
+    return RESULT_ERROR;
+  }
+
+  return RESULT_OK;
+}
+
 t_ion_result_code ion_buffer_io_read_data(t_ion_buffer *self,
                                           t_ion_object_kind kind, void *dst) {
   if (self == NULL)
@@ -317,7 +372,7 @@ t_ion_result_code ion_buffer_io_write_list_close(t_ion_buffer *self) {
 t_ion_result_code ion_buffer_io_read_u0(t_ion_buffer *self) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U0);
+  result = ion_buffer_io_read_check_kind(self, U0);
   if (result != RESULT_OK) {
     return result;
   }
@@ -333,7 +388,7 @@ t_ion_result_code ion_buffer_io_read_u0(t_ion_buffer *self) {
 t_ion_result_code ion_buffer_io_read_u8(t_ion_buffer *self, uint8_t *value) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U8);
+  result = ion_buffer_io_read_check_kind(self, U8);
   if (result != RESULT_OK) {
     return result;
   }
@@ -354,7 +409,7 @@ t_ion_result_code ion_buffer_io_read_u8(t_ion_buffer *self, uint8_t *value) {
 t_ion_result_code ion_buffer_io_read_u16(t_ion_buffer *self, uint16_t *value) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U16);
+  result = ion_buffer_io_read_check_kind(self, U16);
   if (result != RESULT_OK) {
     return result;
   }
@@ -375,7 +430,7 @@ t_ion_result_code ion_buffer_io_read_u16(t_ion_buffer *self, uint16_t *value) {
 t_ion_result_code ion_buffer_io_read_u32(t_ion_buffer *self, uint32_t *value) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U32);
+  result = ion_buffer_io_read_check_kind(self, U32);
   if (result != RESULT_OK) {
     return result;
   }
@@ -396,7 +451,7 @@ t_ion_result_code ion_buffer_io_read_u32(t_ion_buffer *self, uint32_t *value) {
 t_ion_result_code ion_buffer_io_read_u64(t_ion_buffer *self, uint64_t *value) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U64);
+  result = ion_buffer_io_read_check_kind(self, U64);
   if (result != RESULT_OK) {
     return result;
   }
@@ -488,7 +543,7 @@ t_ion_result_code ion_buffer_io_peek_data(t_ion_buffer *self,
 t_ion_result_code ion_buffer_io_peek_u0(t_ion_buffer *self) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U0);
+  result = ion_buffer_io_peek_check_kind(self, U0);
   if (result != RESULT_OK) {
     return result;
   }
@@ -504,7 +559,7 @@ t_ion_result_code ion_buffer_io_peek_u0(t_ion_buffer *self) {
 t_ion_result_code ion_buffer_io_peek_u8(t_ion_buffer *self, uint8_t *value) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U8);
+  result = ion_buffer_io_peek_check_kind(self, U8);
   if (result != RESULT_OK) {
     return result;
   }
@@ -525,7 +580,7 @@ t_ion_result_code ion_buffer_io_peek_u8(t_ion_buffer *self, uint8_t *value) {
 t_ion_result_code ion_buffer_io_peek_u16(t_ion_buffer *self, uint16_t *value) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U16);
+  result = ion_buffer_io_peek_check_kind(self, U16);
   if (result != RESULT_OK) {
     return result;
   }
@@ -546,7 +601,7 @@ t_ion_result_code ion_buffer_io_peek_u16(t_ion_buffer *self, uint16_t *value) {
 t_ion_result_code ion_buffer_io_peek_u32(t_ion_buffer *self, uint32_t *value) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U32);
+  result = ion_buffer_io_peek_check_kind(self, U32);
   if (result != RESULT_OK) {
     return result;
   }
@@ -567,7 +622,7 @@ t_ion_result_code ion_buffer_io_peek_u32(t_ion_buffer *self, uint32_t *value) {
 t_ion_result_code ion_buffer_io_peek_u64(t_ion_buffer *self, uint64_t *value) {
   t_ion_result_code result;
 
-  result = ion_buffer_io_check_kind(self, U64);
+  result = ion_buffer_io_peek_check_kind(self, U64);
   if (result != RESULT_OK) {
     return result;
   }

src/ion.h

@@ -123,7 +123,8 @@ t_ion_result_code ion_buffer_io_write_kind(t_ion_buffer *self, t_ion_object_kind
 t_ion_result_code ion_buffer_io_write_data(t_ion_buffer *self, t_ion_object_kind kind, void *src);
 t_ion_result_code ion_buffer_io_read_kind(t_ion_buffer *self, t_ion_object_kind *value);
 t_ion_result_code ion_buffer_io_peek_kind(t_ion_buffer *self, t_ion_object_kind *value);
-t_ion_result_code ion_buffer_io_check_kind(t_ion_buffer *self, t_ion_object_kind expected);
+t_ion_result_code ion_buffer_io_read_check_kind(t_ion_buffer *self, t_ion_object_kind expected);
+t_ion_result_code ion_buffer_io_peek_check_kind(t_ion_buffer *self, t_ion_object_kind expected);
 t_ion_result_code ion_buffer_io_write_u0(t_ion_buffer *self);
 t_ion_result_code ion_buffer_io_write_u8(t_ion_buffer *self, uint8_t value);
 t_ion_result_code ion_buffer_io_write_u16(t_ion_buffer *self, uint16_t value);