Skip to content

[Basic] Remove llvm::JSON C bridging #76436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2024
Merged

[Basic] Remove llvm::JSON C bridging #76436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 0 additions & 66 deletions include/swift/Basic/BasicBridging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,72 +413,6 @@ class BridgedCharSourceRangeVector {
#endif
};

//===----------------------------------------------------------------------===//
// MARK: Plugins
//===----------------------------------------------------------------------===//

SWIFT_BEGIN_ASSUME_NONNULL

/// Create a new root 'null' JSON value. Clients must call \c JSON_value_delete
/// after using it.
void *JSON_newValue();

/// Parse \p data as a JSON data and return the top-level value. Clients must
/// call \c JSON_value_delete after using it.
void *JSON_deserializedValue(BridgedData data);

/// Serialize a value and populate \p result with the result data. Clients
/// must call \c BridgedData_free after using the \p result.
void JSON_value_serialize(void *valuePtr, BridgedData *result);

/// Destroy and release the memory for \p valuePtr that is a result from
/// \c JSON_newValue() or \c JSON_deserializedValue() .
void JSON_value_delete(void *valuePtr);

bool JSON_value_getAsNull(void *valuePtr);
bool JSON_value_getAsBoolean(void *valuePtr, bool *result);
bool JSON_value_getAsString(void *valuePtr, BridgedData *result);
bool JSON_value_getAsDouble(void *valuePtr, double *result);
bool JSON_value_getAsInteger(void *valuePtr, int64_t *result);
bool JSON_value_getAsObject(void *valuePtr, void *_Nullable *_Nonnull result);
bool JSON_value_getAsArray(void *valuePtr, void *_Nullable *_Nonnull result);

size_t JSON_object_getSize(void *objectPtr);
BridgedData JSON_object_getKey(void *objectPtr, size_t i);
bool JSON_object_hasKey(void *objectPtr, const char *key);
void *JSON_object_getValue(void *objectPtr, const char *key);

size_t JSON_array_getSize(void *arrayPtr);
void *JSON_array_getValue(void *arrayPtr, size_t index);

void JSON_value_emplaceNull(void *valuePtr);
void JSON_value_emplaceBoolean(void *valuePtr, bool value);
void JSON_value_emplaceString(void *valuePtr, const char *value);
void JSON_value_emplaceDouble(void *valuePtr, double value);
void JSON_value_emplaceInteger(void *valuePtr, int64_t value);
void *JSON_value_emplaceNewObject(void *valuePtr);
void *JSON_value_emplaceNewArray(void *valuePtr);

void JSON_object_setNull(void *objectPtr, const char *key);
void JSON_object_setBoolean(void *objectPtr, const char *key, bool value);
void JSON_object_setString(void *objectPtr, const char *key, const char *value);
void JSON_object_setDouble(void *objectPtr, const char *key, double value);
void JSON_object_setInteger(void *objectPtr, const char *key, int64_t value);
void *JSON_object_setNewObject(void *objectPtr, const char *key);
void *JSON_object_setNewArray(void *objectPtr, const char *key);
void *JSON_object_setNewValue(void *objectPtr, const char *key);

void JSON_array_pushNull(void *arrayPtr);
void JSON_array_pushBoolean(void *arrayPtr, bool value);
void JSON_array_pushString(void *arrayPtr, const char *value);
void JSON_array_pushDouble(void *arrayPtr, double value);
void JSON_array_pushInteger(void *arrayPtr, int64_t value);
void *JSON_array_pushNewObject(void *arrayPtr);
void *JSON_array_pushNewArray(void *arrayPtr);
void *JSON_array_pushNewValue(void *arrayPtr);

SWIFT_END_ASSUME_NONNULL

SWIFT_END_NULLABILITY_ANNOTATIONS

#ifndef PURE_BRIDGING_MODE
Expand Down
227 changes: 0 additions & 227 deletions lib/Basic/BasicBridging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "swift/Basic/Assertions.h"
#include "swift/Basic/BasicBridging.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/JSON.h"
#include "llvm/Support/raw_ostream.h"

#ifdef PURE_BRIDGING_MODE
Expand Down Expand Up @@ -95,229 +94,3 @@ void BridgedCharSourceRangeVector::push_back(BridgedCharSourceRange range) {
static_cast<std::vector<CharSourceRange> *>(vector)->push_back(
range.unbridged());
}

//===----------------------------------------------------------------------===//
// MARK: JSON
//===----------------------------------------------------------------------===//

void *JSON_newValue() { return new llvm::json::Value(nullptr); }

void *JSON_deserializedValue(BridgedData data) {
auto result = llvm::json::parse({data.BaseAddress, data.Length});
if (!result) {
return nullptr;
}
return new llvm::json::Value(std::move(*result));
}

void JSON_value_serialize(void *value, BridgedData *out) {
llvm::SmallVector<char, 0> result;
llvm::raw_svector_ostream OS(result);
OS << *static_cast<llvm::json::Value *>(value);

auto outPtr = malloc(result.size());
memcpy(outPtr, result.data(), result.size());
*out = BridgedData{(const char *)outPtr, (size_t)result.size()};
}

void JSON_value_delete(void *value) {
delete static_cast<llvm::json::Value *>(value);
}

bool JSON_value_getAsNull(void *value) {
if (auto val = static_cast<llvm::json::Value *>(value)->getAsNull()) {
return true;
}
return false;
}

bool JSON_value_getAsBoolean(void *value, bool *result) {
if (auto val = static_cast<llvm::json::Value *>(value)->getAsBoolean()) {
*result = *val;
return false;
}
return true;
}

bool JSON_value_getAsDouble(void *value, double *result) {
if (auto val = static_cast<llvm::json::Value *>(value)->getAsNumber()) {
*result = *val;
return false;
}
return true;
}

bool JSON_value_getAsInteger(void *value, int64_t *result) {
if (auto val = static_cast<llvm::json::Value *>(value)->getAsInteger()) {
*result = *val;
return false;
}
return true;
}

bool JSON_value_getAsString(void *value, BridgedData *result) {
if (auto val = static_cast<llvm::json::Value *>(value)->getAsString()) {
*result = {val->data(), val->size()};
return false;
}
return true;
}

bool JSON_value_getAsObject(void *value, void **result) {
if (auto val = static_cast<llvm::json::Value *>(value)->getAsObject()) {
*result = val;
return false;
}
return true;
}
bool JSON_value_getAsArray(void *value, void **result) {
if (auto val = static_cast<llvm::json::Value *>(value)->getAsArray()) {
*result = val;
return false;
}
return true;
}

size_t JSON_object_getSize(void *objectPtr) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
return object->size();
}

BridgedData JSON_object_getKey(void *objectPtr, size_t i) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
std::map<int, float> map;
auto iter = object->begin();
std::advance(iter, i);
auto str = llvm::StringRef(iter->first);
return {str.data(), str.size()};
}

bool JSON_object_hasKey(void *objectPtr, const char *key) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
return object->find(key) != object->end();
}
void *JSON_object_getValue(void *objectPtr, const char *key) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
return object->get(key);
}

size_t JSON_array_getSize(void *objectPtr) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(objectPtr);
return array->size();
}
void *JSON_array_getValue(void *objectPtr, size_t index) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(objectPtr);
return array->data() + index;
}

void JSON_value_emplaceNull(void *valuePtr) {
auto *value = static_cast<llvm::json::Value *>(valuePtr);
*value = nullptr;
}
void JSON_value_emplaceBoolean(void *valuePtr, bool newValue) {
auto *value = static_cast<llvm::json::Value *>(valuePtr);
*value = newValue;
}
void JSON_value_emplaceString(void *valuePtr, const char *newValue) {
auto *value = static_cast<llvm::json::Value *>(valuePtr);
*value = std::string(newValue);
}
void JSON_value_emplaceDouble(void *valuePtr, double newValue) {
auto *value = static_cast<llvm::json::Value *>(valuePtr);
*value = newValue;
}
void JSON_value_emplaceInteger(void *valuePtr, int64_t newValue) {
auto *value = static_cast<llvm::json::Value *>(valuePtr);
*value = newValue;
}
void *JSON_value_emplaceNewObject(void *valuePtr) {
auto *value = static_cast<llvm::json::Value *>(valuePtr);
*value = llvm::json::Object();
return value->getAsObject();
}
void *JSON_value_emplaceNewArray(void *valuePtr) {
auto *value = static_cast<llvm::json::Value *>(valuePtr);
*value = llvm::json::Array();
return value->getAsArray();
}

void JSON_object_setNull(void *objectPtr, const char *key) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
auto keyStr = std::string(key);
(*object)[keyStr] = nullptr;
}
void JSON_object_setBoolean(void *objectPtr, const char *key, bool value) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
auto keyStr = std::string(key);
(*object)[keyStr] = value;
}
void JSON_object_setString(void *objectPtr, const char *key,
const char *value) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
auto keyStr = std::string(key);
(*object)[keyStr] = std::string(value);
}
void JSON_object_setDouble(void *objectPtr, const char *key, double value) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
auto keyStr = std::string(key);
(*object)[keyStr] = value;
}
void JSON_object_setInteger(void *objectPtr, const char *key, int64_t value) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
auto keyStr = std::string(key);
(*object)[keyStr] = value;
}
void *JSON_object_setNewObject(void *objectPtr, const char *key) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
auto keyStr = std::string(key);
(*object)[keyStr] = llvm::json::Object();
return object->getObject(keyStr);
}
void *JSON_object_setNewArray(void *objectPtr, const char *key) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
auto keyStr = std::string(key);
(*object)[keyStr] = llvm::json::Array();
return object->getArray(keyStr);
}
void *JSON_object_setNewValue(void *objectPtr, const char *key) {
llvm::json::Object *object = static_cast<llvm::json::Object *>(objectPtr);
auto keyStr = std::string(key);
(*object)[keyStr] = llvm::json::Value(nullptr);
return object->get(keyStr);
}

void JSON_array_pushNull(void *arrayPtr) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(arrayPtr);
array->emplace_back(nullptr);
}
void JSON_array_pushBoolean(void *arrayPtr, bool value) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(arrayPtr);
array->emplace_back(value);
}
void JSON_array_pushString(void *arrayPtr, const char *value) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(arrayPtr);
array->emplace_back(std::string(value));
}
void JSON_array_pushDouble(void *arrayPtr, double value) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(arrayPtr);
array->emplace_back(value);
}
void JSON_array_pushInteger(void *arrayPtr, int64_t value) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(arrayPtr);
array->emplace_back(value);
}
void *JSON_array_pushNewObject(void *arrayPtr) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(arrayPtr);
array->emplace_back(llvm::json::Object());
return array->back().getAsObject();
}
void *JSON_array_pushNewArray(void *arrayPtr) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(arrayPtr);
array->emplace_back(llvm::json::Array());
return array->back().getAsArray();
}
void *JSON_array_pushNewValue(void *arrayPtr) {
llvm::json::Array *array = static_cast<llvm::json::Array *>(arrayPtr);
array->emplace_back(nullptr);
return &array->back();
}