remove vector.h

extlib/benz/bool.c

@@ -3,6 +3,7 @@
  */
 
 #include "picrin.h"
+#include "picrin/object.h"
 
 #if PIC_NAN_BOXING
 

extlib/benz/cont.c

@@ -3,6 +3,7 @@
  */
 
 #include "picrin.h"
+#include "picrin/object.h"
 
 void
 pic_wind(pic_state *pic, pic_checkpoint *here, pic_checkpoint *there)

extlib/benz/eval.c

@@ -3,6 +3,7 @@
  */
 
 #include "picrin.h"
+#include "picrin/object.h"
 #include "picrin/opcode.h"
 
 static pic_value

extlib/benz/include/picrin.h

@@ -270,7 +270,6 @@ int pic_str_hash(pic_state *, struct pic_string *);
 #include "picrin/record.h"
 #include "picrin/string.h"
 #include "picrin/symbol.h"
-#include "picrin/vector.h"
 
 void *pic_default_allocf(void *, void *, size_t);
 

extlib/benz/include/picrin/object.h

@@ -9,6 +9,20 @@
 extern "C" {
 #endif
 
+
+/* vector */
+
+struct pic_vector {
+  PIC_OBJECT_HEADER
+  pic_value *data;
+  int len;
+};
+
+#define pic_vec_ptr(o) ((struct pic_vector *)pic_obj_ptr(o))
+
+
+/* weak */
+
 KHASH_DECLARE(weak, void *, pic_value)
 
 struct pic_weak {

extlib/benz/include/picrin/vector.h

@@ -1,24 +0,0 @@
-/**
- * See Copyright Notice in picrin.h
- */
-
-#ifndef PICRIN_VECTOR_H
-#define PICRIN_VECTOR_H
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-struct pic_vector {
-  PIC_OBJECT_HEADER
-  pic_value *data;
-  int len;
-};
-
-#define pic_vec_ptr(o) ((struct pic_vector *)pic_obj_ptr(o))
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif

extlib/benz/proc.c

@@ -3,6 +3,7 @@
  */
 
 #include "picrin.h"
+#include "picrin/object.h"
 #include "picrin/opcode.h"
 
 #define MIN(x,y) ((x) < (y) ? (x) : (y))

extlib/benz/read.c

@@ -3,6 +3,7 @@
  */
 
 #include "picrin.h"
+#include "picrin/object.h"
 
 KHASH_DEFINE(read, int, pic_value, kh_int_hash_func, kh_int_hash_equal)
 

extlib/benz/vector.c

@@ -3,6 +3,7 @@
  */
 
 #include "picrin.h"
+#include "picrin/object.h"
 
 struct pic_vector *
 pic_make_vec(pic_state *pic, int len)

extlib/benz/write.c

@@ -3,6 +3,7 @@
  */
 
 #include "picrin.h"
+#include "picrin/object.h"
 
 KHASH_DECLARE(l, void *, int)
 KHASH_DECLARE(v, void *, int)