authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-05-16 12:55:10-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-05-16 12:55:45-04:00
log07d0aee11a5725dc22eeaa116fb59c40a1a7c99c
tree47f4f25746201bedcc29345a55d0cc018e9af241
parente30cd800e23e419fa1bb48f3b63168becc431211
signaturelock-open Commit is signed but in an unrecognized format.

clang C API wrapper: small progress

3 files changed, 71 insertions(+), 22 deletions(-)

src/translate_c.cpp+20-22
......@@ -503,10 +503,6 @@ static AstNode *add_global_var(Context *c, Buf *var_name, AstNode *value_node) {
503503 return node;
504504}
505505
506static Buf *string_ref_to_buf(llvm::StringRef string_ref) {
507 return buf_create_from_mem((const char *)string_ref.bytes_begin(), string_ref.size());
508}
509
510506static AstNode *trans_create_node_apint(Context *c, const ZigClangAPSInt *aps_int) {
511507 AstNode *node = trans_create_node(c, NodeTypeIntLiteral);
512508 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,
671667// FieldAccess
672668// FnCall (.builtin = true)
673669// Symbol "import"
674// clang::StringLiteral "std"
670// ZigClangStringLiteral "std"
675671// Symbol "math"
676672// Symbol "Log2Int"
677673// zig_type_node
......@@ -3334,21 +3330,23 @@ static int trans_switch_default(Context *c, TransScope *parent_scope, const clan
33343330 return ErrorNone;
33353331}
33363332
3337static AstNode *trans_string_literal(Context *c, ResultUsed result_used, TransScope *scope, const clang::StringLiteral *stmt) {
3338 switch (stmt->getKind()) {
3339 case clang::StringLiteral::Ascii:
3340 case clang::StringLiteral::UTF8: {
3341 AstNode *node = trans_create_node_str_lit_c(c, string_ref_to_buf(stmt->getString()));
3333static AstNode *trans_string_literal(Context *c, ResultUsed result_used, TransScope *scope, const ZigClangStringLiteral *stmt) {
3334 switch (ZigClangStringLiteral_getKind(stmt)) {
3335 case ZigClangStringLiteral_StringKind_Ascii:
3336 case ZigClangStringLiteral_StringKind_UTF8: {
3337 size_t str_len;
3338 const char *str_ptr = ZigClangStringLiteral_getString_bytes_begin_size(stmt, &str_len);
3339 AstNode *node = trans_create_node_str_lit_c(c, buf_create_from_mem(str_ptr, str_len));
33423340 return maybe_suppress_result(c, result_used, node);
33433341 }
3344 case clang::StringLiteral::UTF16:
3345 emit_warning(c, bitcast(stmt->getBeginLoc()), "TODO support UTF16 string literals");
3342 case ZigClangStringLiteral_StringKind_UTF16:
3343 emit_warning(c, ZigClangStmt_getBeginLoc((const ZigClangStmt *)stmt), "TODO support UTF16 string literals");
33463344 return nullptr;
3347 case clang::StringLiteral::UTF32:
3348 emit_warning(c, bitcast(stmt->getBeginLoc()), "TODO support UTF32 string literals");
3345 case ZigClangStringLiteral_StringKind_UTF32:
3346 emit_warning(c, ZigClangStmt_getBeginLoc((const ZigClangStmt *)stmt), "TODO support UTF32 string literals");
33493347 return nullptr;
3350 case clang::StringLiteral::Wide:
3351 emit_warning(c, bitcast(stmt->getBeginLoc()), "TODO support wide string literals");
3348 case ZigClangStringLiteral_StringKind_Wide:
3349 emit_warning(c, ZigClangStmt_getBeginLoc((const ZigClangStmt *)stmt), "TODO support wide string literals");
33523350 return nullptr;
33533351 }
33543352 zig_unreachable();
......@@ -3368,14 +3366,14 @@ static AstNode *trans_break_stmt(Context *c, TransScope *scope, const clang::Bre
33683366 zig_unreachable();
33693367}
33703368
3371static AstNode *trans_continue_stmt(Context *c, TransScope *scope, const clang::ContinueStmt *stmt) {
3369static AstNode *trans_continue_stmt(Context *c, TransScope *scope, const ZigClangContinueStmt *stmt) {
33723370 return trans_create_node(c, NodeTypeContinue);
33733371}
33743372
33753373static AstNode *trans_predefined_expr(Context *c, ResultUsed result_used, TransScope *scope,
3376 const clang::PredefinedExpr *expr)
3374 const ZigClangPredefinedExpr *expr)
33773375{
3378 return trans_string_literal(c, result_used, scope, expr->getFunctionName());
3376 return trans_string_literal(c, result_used, scope, ZigClangPredefinedExpr_getFunctionName(expr));
33793377}
33803378
33813379static 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
34663464 }
34673465 case ZigClangStmt_StringLiteralClass:
34683466 return wrap_stmt(out_node, out_child_scope, scope,
3469 trans_string_literal(c, result_used, scope, (const clang::StringLiteral *)stmt));
3467 trans_string_literal(c, result_used, scope, (const ZigClangStringLiteral *)stmt));
34703468 case ZigClangStmt_BreakStmtClass:
34713469 return wrap_stmt(out_node, out_child_scope, scope,
34723470 trans_break_stmt(c, scope, (const clang::BreakStmt *)stmt));
34733471 case ZigClangStmt_ContinueStmtClass:
34743472 return wrap_stmt(out_node, out_child_scope, scope,
3475 trans_continue_stmt(c, scope, (const clang::ContinueStmt *)stmt));
3473 trans_continue_stmt(c, scope, (const ZigClangContinueStmt *)stmt));
34763474 case ZigClangStmt_ParenExprClass:
34773475 return wrap_stmt(out_node, out_child_scope, scope,
34783476 trans_expr(c, result_used, scope,
......@@ -3489,7 +3487,7 @@ static int trans_stmt_extra(Context *c, TransScope *scope, const ZigClangStmt *s
34893487 trans_constant_expr(c, result_used, (const clang::ConstantExpr *)stmt));
34903488 case ZigClangStmt_PredefinedExprClass:
34913489 return wrap_stmt(out_node, out_child_scope, scope,
3492 trans_predefined_expr(c, result_used, scope, (const clang::PredefinedExpr *)stmt));
3490 trans_predefined_expr(c, result_used, scope, (const ZigClangPredefinedExpr *)stmt));
34933491 case ZigClangStmt_StmtExprClass:
34943492 return wrap_stmt(out_node, out_child_scope, scope,
34953493 trans_stmt_expr(c, result_used, scope, (const clang::StmtExpr *)stmt, out_node_scope));
src/zig_clang.cpp+36
......@@ -1271,6 +1271,22 @@ static_assert((llvm::APFloat::roundingMode)ZigClangAPFloat_roundingMode_TowardNe
12711271static_assert((llvm::APFloat::roundingMode)ZigClangAPFloat_roundingMode_TowardZero == llvm::APFloat::rmTowardZero, "");
12721272static_assert((llvm::APFloat::roundingMode)ZigClangAPFloat_roundingMode_NearestTiesToAway == llvm::APFloat::rmNearestTiesToAway, "");
12731273
1274void ZigClang_detect_enum_StringKind(clang::StringLiteral::StringKind x) {
1275 switch (x) {
1276 case clang::StringLiteral::Ascii:
1277 case clang::StringLiteral::Wide:
1278 case clang::StringLiteral::UTF8:
1279 case clang::StringLiteral::UTF16:
1280 case clang::StringLiteral::UTF32:
1281 break;
1282 }
1283}
1284static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_Ascii == clang::StringLiteral::Ascii, "");
1285static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_Wide == clang::StringLiteral::Wide, "");
1286static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_UTF8 == clang::StringLiteral::UTF8, "");
1287static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_UTF16 == clang::StringLiteral::UTF16, "");
1288static_assert((clang::StringLiteral::StringKind)ZigClangStringLiteral_StringKind_UTF32 == clang::StringLiteral::UTF32, "");
1289
12741290
12751291static_assert(sizeof(ZigClangSourceLocation) == sizeof(clang::SourceLocation), "");
12761292static ZigClangSourceLocation bitcast(clang::SourceLocation src) {
......@@ -1852,3 +1868,23 @@ unsigned ZigClangAPFloat_convertToHexString(const ZigClangAPFloat *self, char *D
18521868 auto casted = reinterpret_cast<const llvm::APFloat *>(self);
18531869 return casted->convertToHexString(DST, HexDigits, UpperCase, (llvm::APFloat::roundingMode)RM);
18541870}
1871
1872enum ZigClangStringLiteral_StringKind ZigClangStringLiteral_getKind(const struct ZigClangStringLiteral *self) {
1873 auto casted = reinterpret_cast<const clang::StringLiteral *>(self);
1874 return (ZigClangStringLiteral_StringKind)casted->getKind();
1875}
1876
1877const char *ZigClangStringLiteral_getString_bytes_begin_size(const struct ZigClangStringLiteral *self, size_t *len) {
1878 auto casted = reinterpret_cast<const clang::StringLiteral *>(self);
1879 llvm::StringRef str_ref = casted->getString();
1880 *len = str_ref.size();
1881 return (const char *)str_ref.bytes_begin();
1882}
1883
1884const struct ZigClangStringLiteral *ZigClangPredefinedExpr_getFunctionName(
1885 const struct ZigClangPredefinedExpr *self)
1886{
1887 auto casted = reinterpret_cast<const clang::PredefinedExpr *>(self);
1888 const clang::StringLiteral *result = casted->getFunctionName();
1889 return reinterpret_cast<const struct ZigClangStringLiteral *>(result);
1890}
src/zig_clang.h+15
......@@ -102,6 +102,7 @@ struct ZigClangValueDecl;
102102struct ZigClangVarDecl;
103103struct ZigClangWhileStmt;
104104struct ZigClangFunctionType;
105struct ZigClangPredefinedExpr;
105106
106107typedef struct ZigClangStmt *const * ZigClangCompoundStmt_const_body_iterator;
107108
......@@ -723,6 +724,14 @@ enum ZigClangAPFloat_roundingMode {
723724 ZigClangAPFloat_roundingMode_NearestTiesToAway,
724725};
725726
727enum ZigClangStringLiteral_StringKind {
728 ZigClangStringLiteral_StringKind_Ascii,
729 ZigClangStringLiteral_StringKind_Wide,
730 ZigClangStringLiteral_StringKind_UTF8,
731 ZigClangStringLiteral_StringKind_UTF16,
732 ZigClangStringLiteral_StringKind_UTF32,
733};
734
726735ZIG_EXTERN_C struct ZigClangSourceLocation ZigClangSourceManager_getSpellingLoc(const struct ZigClangSourceManager *,
727736 struct ZigClangSourceLocation Loc);
728737ZIG_EXTERN_C const char *ZigClangSourceManager_getFilename(const struct ZigClangSourceManager *,
......@@ -840,4 +849,10 @@ ZIG_EXTERN_C ZigClangCompoundStmt_const_body_iterator ZigClangCompoundStmt_body_
840849ZIG_EXTERN_C unsigned ZigClangAPFloat_convertToHexString(const struct ZigClangAPFloat *self, char *DST,
841850 unsigned HexDigits, bool UpperCase, enum ZigClangAPFloat_roundingMode RM);
842851
852ZIG_EXTERN_C enum ZigClangStringLiteral_StringKind ZigClangStringLiteral_getKind(const struct ZigClangStringLiteral *self);
853ZIG_EXTERN_C const char *ZigClangStringLiteral_getString_bytes_begin_size(const struct ZigClangStringLiteral *self,
854 size_t *len);
855
856ZIG_EXTERN_C const struct ZigClangStringLiteral *ZigClangPredefinedExpr_getFunctionName(
857 const struct ZigClangPredefinedExpr *self);
843858#endif