remove string.h

2016-02-19 00:14:50 +09:00
parent 645e5bee3a
commit cfc32a1b15
7 changed files with 19 additions and 21 deletions
@@ -268,7 +268,6 @@ int pic_str_hash(pic_state *, struct pic_string *);
 #include "picrin/port.h"
 #include "picrin/proc.h"
 #include "picrin/record.h"
-#include "picrin/string.h"
 #include "picrin/symbol.h"

 void *pic_default_allocf(void *, void *, size_t);
@@ -10,6 +10,19 @@ extern "C" {
 #endif


+/* string */
+
+struct pic_string {
+  PIC_OBJECT_HEADER
+  struct pic_rope *rope;
+};
+
+void pic_rope_incref(pic_state *, struct pic_rope *);
+void pic_rope_decref(pic_state *, struct pic_rope *);
+
+#define pic_str_ptr(o) ((struct pic_string *)pic_obj_ptr(o))
+
+
 /* vector */

 struct pic_vector {
@@ -9,16 +9,6 @@
 extern "C" {
 #endif

-struct pic_string {
-  PIC_OBJECT_HEADER
-  struct pic_rope *rope;
-};
-
-void pic_rope_incref(pic_state *, struct pic_rope *);
-void pic_rope_decref(pic_state *, struct pic_rope *);
-
-#define pic_str_ptr(o) ((struct pic_string *)pic_obj_ptr(o))
-
 #if defined(__cplusplus)
 }
 #endif