Share ref_address everywhere it's used

jkeiser · jkeiser · commit a4765315249b · 2020-05-19T13:30:34.000-07:00
diff --git a/include/simdjson/document.h b/include/simdjson/document.h
@@ -89,6 +89,12 @@ class tape_ref {
   size_t json_index;
 };
 
+#ifdef SIMDJSON_USE_COMPUTED_GOTO
+typedef void* ret_address;
+#else
+typedef char ret_address;
+#endif
+
 } // namespace internal
 
 namespace dom {
@@ -977,13 +983,8 @@ class parser {
   /** @private Tape location of each open { or [ */
   std::unique_ptr<scope_descriptor[]> containing_scope{};
 
-#ifdef SIMDJSON_USE_COMPUTED_GOTO
-  /** @private Return address of each open { or [ */
-  std::unique_ptr<void*[]> ret_address{};
-#else
   /** @private Return address of each open { or [ */
-  std::unique_ptr<char[]> ret_address{};
-#endif
+  std::unique_ptr<internal::ret_address[]> ret_address{};
 
   /** @private Use `if (parser.parse(...).error())` instead */
   bool valid{false};
diff --git a/include/simdjson/inline/document.h b/include/simdjson/inline/document.h
@@ -509,11 +509,7 @@ inline error_code parser::allocate(size_t capacity, size_t max_depth) noexcept {
     // Initialize stage 2 state
     //
     containing_scope.reset(new (std::nothrow) scope_descriptor[max_depth]); // TODO realloc
-  #ifdef SIMDJSON_USE_COMPUTED_GOTO
-    ret_address.reset(new (std::nothrow) void *[max_depth]);
-  #else
-    ret_address.reset(new (std::nothrow) char[max_depth]);
-  #endif
+    ret_address.reset(new (std::nothrow) internal::ret_address[max_depth]);
 
     if (!ret_address || !containing_scope) {
       // Could not allocate memory
diff --git a/src/generic/stage2_build_tape.h b/src/generic/stage2_build_tape.h
@@ -5,13 +5,13 @@
 
 namespace stage2 {
 
+using internal::ret_address;
+
 #ifdef SIMDJSON_USE_COMPUTED_GOTO
-typedef void* ret_address;
 #define INIT_ADDRESSES() { &&array_begin, &&array_continue, &&error, &&finish, &&object_begin, &&object_continue }
 #define GOTO(address) { goto *(address); }
 #define CONTINUE(address) { goto *(address); }
-#else
-typedef char ret_address;
+#else // SIMDJSON_USE_COMPUTED_GOTO
 #define INIT_ADDRESSES() { '[', 'a', 'e', 'f', '{', 'o' };
 #define GOTO(address)                 \
   {                                   \
@@ -33,7 +33,7 @@ typedef char ret_address;
       case 'f': goto finish;          \
     }                                 \
   }
-#endif
+#endif // SIMDJSON_USE_COMPUTED_GOTO
 
 struct unified_machine_addresses {
   ret_address array_begin;
