authorgravatar for codroid@gmail.comhryx <codroid@gmail.com> 2019-06-08 17:02:00-07:00
committergravatar for codroid@gmail.comhryx <codroid@gmail.com> 2019-06-08 17:02:00-07:00
log586c36dd1d37d06bdf84fcf867165b8861825cb8
tree3252beeff2ec39c9fe092ab2553b3f263b162cc3
parentad0f0562d8103d65bd36eb12ead899f375bda3e0
signature Commit is signed but in an unrecognized format.

Restore fn decls removed during conflict

1 files changed, 34 insertions(+), 0 deletions(-)

src-self-hosted/clang.zig+34
...@@ -723,6 +723,7 @@ pub extern fn ZigClangSourceLocation_eq(a: struct_ZigClangSourceLocation, b: str...@@ -723,6 +723,7 @@ pub extern fn ZigClangSourceLocation_eq(a: struct_ZigClangSourceLocation, b: str
723pub extern fn ZigClangTypedefType_getDecl(self: ?*const struct_ZigClangTypedefType) ?*const struct_ZigClangTypedefNameDecl;723pub extern fn ZigClangTypedefType_getDecl(self: ?*const struct_ZigClangTypedefType) ?*const struct_ZigClangTypedefNameDecl;
724pub extern fn ZigClangTypedefNameDecl_getUnderlyingType(self: ?*const struct_ZigClangTypedefNameDecl) struct_ZigClangQualType;724pub extern fn ZigClangTypedefNameDecl_getUnderlyingType(self: ?*const struct_ZigClangTypedefNameDecl) struct_ZigClangQualType;
725pub extern fn ZigClangQualType_getCanonicalType(self: struct_ZigClangQualType) struct_ZigClangQualType;725pub extern fn ZigClangQualType_getCanonicalType(self: struct_ZigClangQualType) struct_ZigClangQualType;
726pub extern fn ZigClangQualType_getTypeClass(self: struct_ZigClangQualType) ZigClangTypeClass;
726pub extern fn ZigClangQualType_getTypePtr(self: struct_ZigClangQualType) *const struct_ZigClangType;727pub extern fn ZigClangQualType_getTypePtr(self: struct_ZigClangQualType) *const struct_ZigClangType;
727pub extern fn ZigClangQualType_addConst(self: [*c]struct_ZigClangQualType) void;728pub extern fn ZigClangQualType_addConst(self: [*c]struct_ZigClangQualType) void;
728pub extern fn ZigClangQualType_eq(self: struct_ZigClangQualType, arg1: struct_ZigClangQualType) bool;729pub extern fn ZigClangQualType_eq(self: struct_ZigClangQualType, arg1: struct_ZigClangQualType) bool;
...@@ -730,6 +731,7 @@ pub extern fn ZigClangQualType_isConstQualified(self: struct_ZigClangQualType) b...@@ -730,6 +731,7 @@ pub extern fn ZigClangQualType_isConstQualified(self: struct_ZigClangQualType) b
730pub extern fn ZigClangQualType_isVolatileQualified(self: struct_ZigClangQualType) bool;731pub extern fn ZigClangQualType_isVolatileQualified(self: struct_ZigClangQualType) bool;
731pub extern fn ZigClangQualType_isRestrictQualified(self: struct_ZigClangQualType) bool;732pub extern fn ZigClangQualType_isRestrictQualified(self: struct_ZigClangQualType) bool;
732pub extern fn ZigClangType_getTypeClass(self: ?*const struct_ZigClangType) ZigClangTypeClass;733pub extern fn ZigClangType_getTypeClass(self: ?*const struct_ZigClangType) ZigClangTypeClass;
734pub extern fn ZigClangType_getPointeeType(self: ?*const struct_ZigClangType) struct_ZigClangQualType;
733pub extern fn ZigClangType_isVoidType(self: ?*const struct_ZigClangType) bool;735pub extern fn ZigClangType_isVoidType(self: ?*const struct_ZigClangType) bool;
734pub extern fn ZigClangType_getTypeClassName(self: *const struct_ZigClangType) [*]const u8;736pub extern fn ZigClangType_getTypeClassName(self: *const struct_ZigClangType) [*]const u8;
735pub extern fn ZigClangStmt_getBeginLoc(self: *const struct_ZigClangStmt) struct_ZigClangSourceLocation;737pub extern fn ZigClangStmt_getBeginLoc(self: *const struct_ZigClangStmt) struct_ZigClangSourceLocation;
...@@ -894,3 +896,35 @@ pub const ZigClangCompoundStmt_const_body_iterator = [*c]const *struct_ZigClangS...@@ -894,3 +896,35 @@ pub const ZigClangCompoundStmt_const_body_iterator = [*c]const *struct_ZigClangS
894896
895pub extern fn ZigClangCompoundStmt_body_begin(self: *const ZigClangCompoundStmt) ZigClangCompoundStmt_const_body_iterator;897pub extern fn ZigClangCompoundStmt_body_begin(self: *const ZigClangCompoundStmt) ZigClangCompoundStmt_const_body_iterator;
896pub extern fn ZigClangCompoundStmt_body_end(self: *const ZigClangCompoundStmt) ZigClangCompoundStmt_const_body_iterator;898pub extern fn ZigClangCompoundStmt_body_end(self: *const ZigClangCompoundStmt) ZigClangCompoundStmt_const_body_iterator;
899
900pub const ZigClangDeclStmt_const_decl_iterator = [*c]const *struct_ZigClangDecl;
901
902pub extern fn ZigClangDeclStmt_decl_begin(self: *const ZigClangDeclStmt) ZigClangDeclStmt_const_decl_iterator;
903pub extern fn ZigClangDeclStmt_decl_end(self: *const ZigClangDeclStmt) ZigClangDeclStmt_const_decl_iterator;
904
905pub extern fn ZigClangVarDecl_getType(self: ?*const struct_ZigClangVarDecl) struct_ZigClangQualType;
906pub extern fn ZigClangVarDecl_getInit(*const ZigClangVarDecl) ?*const ZigClangExpr;
907pub extern fn ZigClangVarDecl_getTLSKind(self: ?*const struct_ZigClangVarDecl) ZigClangVarDecl_TLSKind;
908pub const ZigClangVarDecl_TLSKind = extern enum {
909 None,
910 Static,
911 Dynamic,
912};
913
914pub extern fn ZigClangImplicitCastExpr_getBeginLoc(*const ZigClangImplicitCastExpr) ZigClangSourceLocation;
915pub extern fn ZigClangImplicitCastExpr_getCastKind(*const ZigClangImplicitCastExpr) ZigClangCK;
916pub extern fn ZigClangImplicitCastExpr_getSubExpr(*const ZigClangImplicitCastExpr) *const ZigClangExpr;
917
918pub extern fn ZigClangArrayType_getElementType(*const ZigClangArrayType) ZigClangQualType;
919
920pub extern fn ZigClangDeclRefExpr_getDecl(*const ZigClangDeclRefExpr) *const ZigClangValueDecl;
921
922pub extern fn ZigClangParenType_getInnerType(*const ZigClangParenType) ZigClangQualType;
923
924pub extern fn ZigClangElaboratedType_getNamedType(*const ZigClangElaboratedType) ZigClangQualType;
925
926pub extern fn ZigClangAttributedType_getEquivalentType(*const ZigClangAttributedType) ZigClangQualType;
927
928pub extern fn ZigClangCStyleCastExpr_getBeginLoc(*const ZigClangCStyleCastExpr) ZigClangSourceLocation;
929pub extern fn ZigClangCStyleCastExpr_getSubExpr(*const ZigClangCStyleCastExpr) *const ZigClangExpr;
930pub extern fn ZigClangCStyleCastExpr_getType(*const ZigClangCStyleCastExpr) ZigClangQualType;