don't need adt.h any more

cloudflare · Nov 30, 2014 · ad9fc1d · ad9fc1d
1 parent 0827c1e
commit ad9fc1d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 196 deletions.
diff --git a/adt.h b/adt.h
diff --git a/parse_array.c b/parse_array.c
@@ -1,4 +1,5 @@
 #include <stdint.h>
+#include "util.h"
 #include "parser.h"
 
 static const char* syntax_err = "Array syntax error, expect ',' or ']'";

diff --git a/parse_hashtab.c b/parse_hashtab.c
@@ -1,3 +1,4 @@
+#include "util.h"
 #include "parser.h"
 
 static void

diff --git a/parser.c b/parser.c
@@ -54,8 +54,8 @@
 #include <inttypes.h>
 #include <ctype.h>
 
+#include "util.h"
 #include "mempool.h"
-#include "adt.h"
 #include "scaner.h"
 #include "parser.h"
 

diff --git a/parser.h b/parser.h
@@ -1,7 +1,7 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include "adt.h"
+//#include "adt.h"
 #include "mempool.h"
 #include "ljson_parser.h"
 #include "scaner.h"
@@ -59,17 +59,6 @@ composite_state_t* pstack_pop(parser_t*);
  */
 int emit_primitive_tk(mempool_t* mp, token_t* tk, obj_composite_t* nesting_obj);
 
-static inline int
-insert_primitive_subobj(mempool_t* mp, slist_t* subobj_list, obj_t* subobj) {
-    slist_elmt_t* subobj_elmt = MEMPOOL_ALLOC_TYPE(mp, slist_elmt_t);
-    if (unlikely(!subobj_elmt))
-        return 0;
-
-    subobj_elmt->ptr_val = subobj;
-    slist_prepend(subobj_list, subobj_elmt);
-    return 1;
-}
-
 void insert_subobj(obj_composite_t* nesting, obj_t* nested);
 
 void __attribute__((format(printf, 2, 3), cold))