Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang C API wrapper: small progress

Browse Source
This commit is contained in:
Andrew Kelley 2019-05-16 12:55:10 -04:00
parent e30cd800e2
commit 07d0aee11a
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
3 changed files with 71 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/translate_c.cpp
View File

@ -503,10 +503,6 @@ static AstNode *add_global_var(Context *c, Buf *var_name, AstNode *value_node) {
return node;
}
static Buf *string_ref_to_buf(llvm::StringRef string_ref) {
return buf_create_from_mem((const char *)string_ref.bytes_begin(), string_ref.size());
}
static AstNode *trans_create_node_apint(Context *c, const ZigClangAPSInt *aps_int) {
AstNode *node = trans_create_node(c, NodeTypeIntLiteral);
node->data.int_literal.bigint = allocate<BigInt>(1);
@ -671,7 +667,7 @@ static AstNode *qual_type_to_log2_int_ref(Context *c, const ZigClangQualType qt,
// FieldAccess
// FnCall (.builtin = true)
// Symbol "import"
// clang::StringLiteral "std"
// ZigClangStringLiteral "std"
// Symbol "math"
// Symbol "Log2Int"
// zig_type_node
@ -3334,21 +3330,23 @@ static int trans_switch_default(Context *c, TransScope *parent_scope, const clan
return ErrorNone;
}
static AstNode *trans_string_literal(Context *c, ResultUsed result_used, TransScope *scope, const clang::StringLiteral *stmt) {
switch (stmt->getKind()) {
case clang::StringLiteral::Ascii:
case clang::StringLiteral::UTF8: {
AstNode *node = trans_create_node_str_lit_c(c, string_ref_to_buf(stmt->getString()));
static AstNode *trans_string_literal(Context *c, ResultUsed result_used, TransScope *scope, const ZigClangStringLiteral *stmt) {
switch (ZigClangStringLiteral_getKind(stmt)) {
case ZigClangStringLiteral_StringKind_Ascii:
case ZigClangStringLiteral_StringKind_UTF8: {
size_t str_len;
const char *str_ptr = ZigClangStringLiteral_getString_bytes_begin_size(stmt, &str_len);
AstNode *node = trans_create_node_str_lit_c(c, buf_create_from_mem(str_ptr, str_len));
return maybe_suppress_result(c, result_used, node);
}
case clang::StringLiteral::UTF16:
emit_warning(c, bitcast(stmt->getBeginLoc()), "TODO support UTF16 string literals");
case ZigClangStringLiteral_StringKind_UTF16:
emit_warning(c, ZigClangStmt_getBeginLoc((const ZigClangStmt *)stmt), "TODO support UTF16 string literals");
return nullptr;
case clang::StringLiteral::UTF32:
emit_warning(c, bitcast(stmt->getBeginLoc()), "TODO support UTF32 string literals");
case ZigClangStringLiteral_StringKind_UTF32:
emit_warning(c, ZigClangStmt_getBeginLoc((const ZigClangStmt *)stmt), "TODO support UTF32 string literals");
return nullptr;
case clang::StringLiteral::Wide:
emit_warning(c, bitcast(stmt->getBeginLoc()), "TODO support wide string literals");
case ZigClangStringLiteral_StringKind_Wide:
emit_warning(c, ZigClangStmt_getBeginLoc((const ZigClangStmt *)stmt), "TODO support wide string literals");
return nullptr;
}
zig_unreachable();
@ -3368,14 +3366,14 @@ static AstNode *trans_break_stmt(Context *c, TransScope *scope, const clang::Bre
zig_unreachable();
}
static AstNode *trans_continue_stmt(Context *c, TransScope *scope, const clang::ContinueStmt *stmt) {
static AstNode *trans_continue_stmt(Context *c, TransScope *scope, const ZigClangContinueStmt *stmt) {
return trans_create_node(c, NodeTypeContinue);
}
static AstNode *trans_predefined_expr(Context *c, ResultUsed result_used, TransScope *scope,
const clang::PredefinedExpr *expr)
const ZigClangPredefinedExpr *expr)
{
return trans_string_literal(c, result_used, scope, expr->getFunctionName());
return trans_string_literal(c, result_used, scope, ZigClangPredefinedExpr_getFunctionName(expr));
}
static int wrap_stmt(AstNode **out_node, TransScope **out_scope, TransScope *in_scope, AstNode *result_node) {
@ -3466,13 +3464,13 @@ static int trans_stmt_extra(Context *c, TransScope *scope, const ZigClangStmt *s
}
case ZigClangStmt_StringLiteralClass:
return wrap_stmt(out_node, out_child_scope, scope,
trans_string_literal(c, result_used, scope, (const clang::StringLiteral *)stmt));
trans_string_literal(c, result_used, scope, (const ZigClangStringLiteral *)stmt));
case ZigClangStmt_BreakStmtClass:
return wrap_stmt(out_node, out_child_scope, scope,
trans_break_stmt(c, scope, (const clang::BreakStmt *)stmt));
case ZigClangStmt_ContinueStmtClass:
return wrap_stmt(out_node, out_child_scope, scope,
trans_continue_stmt(c, scope, (const clang::ContinueStmt *)stmt));
trans_continue_stmt(c, scope, (const ZigClangContinueStmt *)stmt));
case ZigClangStmt_ParenExprClass:
return wrap_stmt(out_node, out_child_scope, scope,
trans_expr(c, result_used, scope,
@ -3489,7 +3487,7 @@ static int trans_stmt_extra(Context *c, TransScope *scope, const ZigClangStmt *s
trans_constant_expr(c, result_used, (const clang::ConstantExpr *)stmt));
case ZigClangStmt_PredefinedExprClass:
return wrap_stmt(out_node, out_child_scope, scope,
trans_predefined_expr(c, result_used, scope, (const clang::PredefinedExpr *)stmt));
trans_predefined_expr(c, result_used, scope, (const ZigClangPredefinedExpr *)stmt));
case ZigClangStmt_StmtExprClass:
return wrap_stmt(out_node, out_child_scope, scope,
trans_stmt_expr(c, result_used, scope, (const clang::StmtExpr *)stmt, out_node_scope));

36
src/zig_clang.cpp
View File

@ -1271,6 +1271,22 @@ static_assert((llvm::APFloat::roundingMode)ZigClangAPFloat_roundingMode_TowardNe
static_assert((llvm::APFloat::roundingMode)ZigClangAPFloat_roundingMode_TowardZero == llvm::APFloat::rmTowardZero, "");
static_assert((llvm::APFloat::roundingMode)ZigClangAPFloat_roundingMode_NearestTiesToAway == llvm::APFloat::rmNearestTiesToAway, "");
void ZigClang_detect_enum_StringKind(clang::StringLiteral::StringKind x) {
switch (x) {
case clang::StringLiteral::Ascii:
case clang::StringLiteral::Wide:
case clang::StringLiteral::UTF8:
case clang::StringLiteral::UTF16:
case clang::StringLiteral::UTF32:
break;
}
}
static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_Ascii == clang::StringLiteral::Ascii, "");
static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_Wide == clang::StringLiteral::Wide, "");
static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_UTF8 == clang::StringLiteral::UTF8, "");
static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_UTF16 == clang::StringLiteral::UTF16, "");
static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_UTF32 == clang::StringLiteral::UTF32, "");
static_assert(sizeof(ZigClangSourceLocation) == sizeof(clang::SourceLocation), "");
static ZigClangSourceLocation bitcast(clang::SourceLocation src) {
@ -1852,3 +1868,23 @@ unsigned ZigClangAPFloat_convertToHexString(const ZigClangAPFloat *self, char *D
auto casted = reinterpret_cast<const llvm::APFloat *>(self);
return casted->convertToHexString(DST, HexDigits, UpperCase, (llvm::APFloat::roundingMode)RM);
}
enum ZigClangStringLiteral_StringKind ZigClangStringLiteral_getKind(const struct ZigClangStringLiteral *self) {
auto casted = reinterpret_cast<const clang::StringLiteral *>(self);
return (ZigClangStringLiteral_StringKind)casted->getKind();
}
const char *ZigClangStringLiteral_getString_bytes_begin_size(const struct ZigClangStringLiteral *self, size_t *len) {
auto casted = reinterpret_cast<const clang::StringLiteral *>(self);
llvm::StringRef str_ref = casted->getString();
*len = str_ref.size();
return (const char *)str_ref.bytes_begin();
}
const struct ZigClangStringLiteral *ZigClangPredefinedExpr_getFunctionName(
const struct ZigClangPredefinedExpr *self)
{
auto casted = reinterpret_cast<const clang::PredefinedExpr *>(self);
const clang::StringLiteral *result = casted->getFunctionName();
return reinterpret_cast<const struct ZigClangStringLiteral *>(result);
}

15
src/zig_clang.h
View File

@ -102,6 +102,7 @@ struct ZigClangValueDecl;
struct ZigClangVarDecl;
struct ZigClangWhileStmt;
struct ZigClangFunctionType;
struct ZigClangPredefinedExpr;
typedef struct ZigClangStmt *const * ZigClangCompoundStmt_const_body_iterator;
@ -723,6 +724,14 @@ enum ZigClangAPFloat_roundingMode {
ZigClangAPFloat_roundingMode_NearestTiesToAway,
};
enum ZigClangStringLiteral_StringKind {
ZigClangStringLiteral_StringKind_Ascii,
ZigClangStringLiteral_StringKind_Wide,
ZigClangStringLiteral_StringKind_UTF8,
ZigClangStringLiteral_StringKind_UTF16,
ZigClangStringLiteral_StringKind_UTF32,
};
ZIG_EXTERN_C struct ZigClangSourceLocation ZigClangSourceManager_getSpellingLoc(const struct ZigClangSourceManager *,
struct ZigClangSourceLocation Loc);
ZIG_EXTERN_C const char *ZigClangSourceManager_getFilename(const struct ZigClangSourceManager *,
@ -840,4 +849,10 @@ ZIG_EXTERN_C ZigClangCompoundStmt_const_body_iterator ZigClangCompoundStmt_body_
ZIG_EXTERN_C unsigned ZigClangAPFloat_convertToHexString(const struct ZigClangAPFloat *self, char *DST,
unsigned HexDigits, bool UpperCase, enum ZigClangAPFloat_roundingMode RM);
ZIG_EXTERN_C enum ZigClangStringLiteral_StringKind ZigClangStringLiteral_getKind(const struct ZigClangStringLiteral *self);
ZIG_EXTERN_C const char *ZigClangStringLiteral_getString_bytes_begin_size(const struct ZigClangStringLiteral *self,
size_t *len);
ZIG_EXTERN_C const struct ZigClangStringLiteral *ZigClangPredefinedExpr_getFunctionName(
const struct ZigClangPredefinedExpr *self);
#endif