From 775a25b7fda884a99240c63627e399ec347d2446 Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Tue, 21 May 2019 15:23:28 +0200 Subject: [PATCH 01/10] Add declarations missing from clang.zig --- src-self-hosted/clang.zig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index 92fe7b7cd..b706c1c54 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -1,5 +1,6 @@ pub const struct_ZigClangAPValue = @OpaqueType(); pub const struct_ZigClangAPSInt = @OpaqueType(); +pub const struct_ZigClangAPFloat = @OpaqueType(); pub const struct_ZigClangASTContext = @OpaqueType(); pub const struct_ZigClangASTUnit = @OpaqueType(); pub const struct_ZigClangArraySubscriptExpr = @OpaqueType(); @@ -69,6 +70,7 @@ pub const struct_ZigClangValueDecl = @OpaqueType(); pub const struct_ZigClangVarDecl = @OpaqueType(); pub const struct_ZigClangWhileStmt = @OpaqueType(); pub const ZigClangFunctionType = @OpaqueType(); +pub const struct_ZigClangPredefinedExpr = @OpaqueType(); pub const ZigClangBO = extern enum { PtrMemD, From 333c050a1dbb42c36051d8ec4dc9550d9d6eee63 Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Wed, 22 May 2019 15:28:27 +0200 Subject: [PATCH 02/10] clang.zig cleanup #1: move block around --- src-self-hosted/clang.zig | 154 +++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index b706c1c54..5386641df 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -452,6 +452,83 @@ pub const ZigClangAPValueKind = extern enum { AddrLabelDiff, }; +pub const ZigClangDeclKind = extern enum { + AccessSpec, + Block, + Captured, + ClassScopeFunctionSpecialization, + Empty, + Export, + ExternCContext, + FileScopeAsm, + Friend, + FriendTemplate, + Import, + LinkageSpec, + Label, + Namespace, + NamespaceAlias, + ObjCCompatibleAlias, + ObjCCategory, + ObjCCategoryImpl, + ObjCImplementation, + ObjCInterface, + ObjCProtocol, + ObjCMethod, + ObjCProperty, + BuiltinTemplate, + ClassTemplate, + FunctionTemplate, + TypeAliasTemplate, + VarTemplate, + TemplateTemplateParm, + Enum, + Record, + CXXRecord, + ClassTemplateSpecialization, + ClassTemplatePartialSpecialization, + TemplateTypeParm, + ObjCTypeParam, + TypeAlias, + Typedef, + UnresolvedUsingTypename, + Using, + UsingDirective, + UsingPack, + UsingShadow, + ConstructorUsingShadow, + Binding, + Field, + ObjCAtDefsField, + ObjCIvar, + Function, + CXXDeductionGuide, + CXXMethod, + CXXConstructor, + CXXConversion, + CXXDestructor, + MSProperty, + NonTypeTemplateParm, + Var, + Decomposition, + ImplicitParam, + OMPCapturedExpr, + ParmVar, + VarTemplateSpecialization, + VarTemplatePartialSpecialization, + EnumConstant, + IndirectField, + OMPDeclareReduction, + UnresolvedUsingValue, + OMPRequires, + OMPThreadPrivate, + ObjCPropertyImpl, + PragmaComment, + PragmaDetectMismatch, + StaticAssert, + TranslationUnit, +}; + pub extern fn ZigClangSourceManager_getSpellingLoc(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) struct_ZigClangSourceLocation; pub extern fn ZigClangSourceManager_getFilename(self: *const struct_ZigClangSourceManager, SpellingLoc: struct_ZigClangSourceLocation) ?[*]const u8; pub extern fn ZigClangSourceManager_getSpellingLineNumber(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; @@ -632,83 +709,6 @@ pub extern fn ZigClangLoadFromCommandLine( pub extern fn ZigClangDecl_getKind(decl: *const ZigClangDecl) ZigClangDeclKind; pub extern fn ZigClangDecl_getDeclKindName(decl: *const struct_ZigClangDecl) [*]const u8; -pub const ZigClangDeclKind = extern enum { - AccessSpec, - Block, - Captured, - ClassScopeFunctionSpecialization, - Empty, - Export, - ExternCContext, - FileScopeAsm, - Friend, - FriendTemplate, - Import, - LinkageSpec, - Label, - Namespace, - NamespaceAlias, - ObjCCompatibleAlias, - ObjCCategory, - ObjCCategoryImpl, - ObjCImplementation, - ObjCInterface, - ObjCProtocol, - ObjCMethod, - ObjCProperty, - BuiltinTemplate, - ClassTemplate, - FunctionTemplate, - TypeAliasTemplate, - VarTemplate, - TemplateTemplateParm, - Enum, - Record, - CXXRecord, - ClassTemplateSpecialization, - ClassTemplatePartialSpecialization, - TemplateTypeParm, - ObjCTypeParam, - TypeAlias, - Typedef, - UnresolvedUsingTypename, - Using, - UsingDirective, - UsingPack, - UsingShadow, - ConstructorUsingShadow, - Binding, - Field, - ObjCAtDefsField, - ObjCIvar, - Function, - CXXDeductionGuide, - CXXMethod, - CXXConstructor, - CXXConversion, - CXXDestructor, - MSProperty, - NonTypeTemplateParm, - Var, - Decomposition, - ImplicitParam, - OMPCapturedExpr, - ParmVar, - VarTemplateSpecialization, - VarTemplatePartialSpecialization, - EnumConstant, - IndirectField, - OMPDeclareReduction, - UnresolvedUsingValue, - OMPRequires, - OMPThreadPrivate, - ObjCPropertyImpl, - PragmaComment, - PragmaDetectMismatch, - StaticAssert, - TranslationUnit, -}; - pub const struct_ZigClangQualType = extern struct { ptr: ?*c_void, }; From abf97cc2329450619ecfbbe50b4c685e7ff003da Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Wed, 22 May 2019 15:29:27 +0200 Subject: [PATCH 03/10] clang.zig cleanup #2: move block around --- src-self-hosted/clang.zig | 238 +++++++++++++++++++------------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index 5386641df..a2c01610c 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -529,6 +529,125 @@ pub const ZigClangDeclKind = extern enum { TranslationUnit, }; +pub const ZigClangBuiltinTypeKind = extern enum { + OCLImage1dRO, + OCLImage1dArrayRO, + OCLImage1dBufferRO, + OCLImage2dRO, + OCLImage2dArrayRO, + OCLImage2dDepthRO, + OCLImage2dArrayDepthRO, + OCLImage2dMSAARO, + OCLImage2dArrayMSAARO, + OCLImage2dMSAADepthRO, + OCLImage2dArrayMSAADepthRO, + OCLImage3dRO, + OCLImage1dWO, + OCLImage1dArrayWO, + OCLImage1dBufferWO, + OCLImage2dWO, + OCLImage2dArrayWO, + OCLImage2dDepthWO, + OCLImage2dArrayDepthWO, + OCLImage2dMSAAWO, + OCLImage2dArrayMSAAWO, + OCLImage2dMSAADepthWO, + OCLImage2dArrayMSAADepthWO, + OCLImage3dWO, + OCLImage1dRW, + OCLImage1dArrayRW, + OCLImage1dBufferRW, + OCLImage2dRW, + OCLImage2dArrayRW, + OCLImage2dDepthRW, + OCLImage2dArrayDepthRW, + OCLImage2dMSAARW, + OCLImage2dArrayMSAARW, + OCLImage2dMSAADepthRW, + OCLImage2dArrayMSAADepthRW, + OCLImage3dRW, + OCLIntelSubgroupAVCMcePayload, + OCLIntelSubgroupAVCImePayload, + OCLIntelSubgroupAVCRefPayload, + OCLIntelSubgroupAVCSicPayload, + OCLIntelSubgroupAVCMceResult, + OCLIntelSubgroupAVCImeResult, + OCLIntelSubgroupAVCRefResult, + OCLIntelSubgroupAVCSicResult, + OCLIntelSubgroupAVCImeResultSingleRefStreamout, + OCLIntelSubgroupAVCImeResultDualRefStreamout, + OCLIntelSubgroupAVCImeSingleRefStreamin, + OCLIntelSubgroupAVCImeDualRefStreamin, + Void, + Bool, + Char_U, + UChar, + WChar_U, + Char8, + Char16, + Char32, + UShort, + UInt, + ULong, + ULongLong, + UInt128, + Char_S, + SChar, + WChar_S, + Short, + Int, + Long, + LongLong, + Int128, + ShortAccum, + Accum, + LongAccum, + UShortAccum, + UAccum, + ULongAccum, + ShortFract, + Fract, + LongFract, + UShortFract, + UFract, + ULongFract, + SatShortAccum, + SatAccum, + SatLongAccum, + SatUShortAccum, + SatUAccum, + SatULongAccum, + SatShortFract, + SatFract, + SatLongFract, + SatUShortFract, + SatUFract, + SatULongFract, + Half, + Float, + Double, + LongDouble, + Float16, + Float128, + NullPtr, + ObjCId, + ObjCClass, + ObjCSel, + OCLSampler, + OCLEvent, + OCLClkEvent, + OCLQueue, + OCLReserveID, + Dependent, + Overload, + BoundMember, + PseudoObject, + UnknownAny, + BuiltinFn, + ARCUnbridgedCast, + OMPArraySection, +}; + pub extern fn ZigClangSourceManager_getSpellingLoc(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) struct_ZigClangSourceLocation; pub extern fn ZigClangSourceManager_getFilename(self: *const struct_ZigClangSourceManager, SpellingLoc: struct_ZigClangSourceLocation) ?[*]const u8; pub extern fn ZigClangSourceManager_getSpellingLineNumber(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; @@ -713,125 +832,6 @@ pub const struct_ZigClangQualType = extern struct { ptr: ?*c_void, }; -pub const ZigClangBuiltinTypeKind = extern enum { - OCLImage1dRO, - OCLImage1dArrayRO, - OCLImage1dBufferRO, - OCLImage2dRO, - OCLImage2dArrayRO, - OCLImage2dDepthRO, - OCLImage2dArrayDepthRO, - OCLImage2dMSAARO, - OCLImage2dArrayMSAARO, - OCLImage2dMSAADepthRO, - OCLImage2dArrayMSAADepthRO, - OCLImage3dRO, - OCLImage1dWO, - OCLImage1dArrayWO, - OCLImage1dBufferWO, - OCLImage2dWO, - OCLImage2dArrayWO, - OCLImage2dDepthWO, - OCLImage2dArrayDepthWO, - OCLImage2dMSAAWO, - OCLImage2dArrayMSAAWO, - OCLImage2dMSAADepthWO, - OCLImage2dArrayMSAADepthWO, - OCLImage3dWO, - OCLImage1dRW, - OCLImage1dArrayRW, - OCLImage1dBufferRW, - OCLImage2dRW, - OCLImage2dArrayRW, - OCLImage2dDepthRW, - OCLImage2dArrayDepthRW, - OCLImage2dMSAARW, - OCLImage2dArrayMSAARW, - OCLImage2dMSAADepthRW, - OCLImage2dArrayMSAADepthRW, - OCLImage3dRW, - OCLIntelSubgroupAVCMcePayload, - OCLIntelSubgroupAVCImePayload, - OCLIntelSubgroupAVCRefPayload, - OCLIntelSubgroupAVCSicPayload, - OCLIntelSubgroupAVCMceResult, - OCLIntelSubgroupAVCImeResult, - OCLIntelSubgroupAVCRefResult, - OCLIntelSubgroupAVCSicResult, - OCLIntelSubgroupAVCImeResultSingleRefStreamout, - OCLIntelSubgroupAVCImeResultDualRefStreamout, - OCLIntelSubgroupAVCImeSingleRefStreamin, - OCLIntelSubgroupAVCImeDualRefStreamin, - Void, - Bool, - Char_U, - UChar, - WChar_U, - Char8, - Char16, - Char32, - UShort, - UInt, - ULong, - ULongLong, - UInt128, - Char_S, - SChar, - WChar_S, - Short, - Int, - Long, - LongLong, - Int128, - ShortAccum, - Accum, - LongAccum, - UShortAccum, - UAccum, - ULongAccum, - ShortFract, - Fract, - LongFract, - UShortFract, - UFract, - ULongFract, - SatShortAccum, - SatAccum, - SatLongAccum, - SatUShortAccum, - SatUAccum, - SatULongAccum, - SatShortFract, - SatFract, - SatLongFract, - SatUShortFract, - SatUFract, - SatULongFract, - Half, - Float, - Double, - LongDouble, - Float16, - Float128, - NullPtr, - ObjCId, - ObjCClass, - ObjCSel, - OCLSampler, - OCLEvent, - OCLClkEvent, - OCLQueue, - OCLReserveID, - Dependent, - Overload, - BoundMember, - PseudoObject, - UnknownAny, - BuiltinFn, - ARCUnbridgedCast, - OMPArraySection, -}; - pub const ZigClangCallingConv = extern enum { C, X86StdCall, From 5df2e791c26df0ac9ef6ba0e3558eda7fe10d6b0 Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Wed, 22 May 2019 15:29:49 +0200 Subject: [PATCH 04/10] clang.zig cleanup #3: move block around --- src-self-hosted/clang.zig | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index a2c01610c..1edd5690a 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -648,6 +648,27 @@ pub const ZigClangBuiltinTypeKind = extern enum { OMPArraySection, }; +pub const ZigClangCallingConv = extern enum { + C, + X86StdCall, + X86FastCall, + X86ThisCall, + X86VectorCall, + X86Pascal, + Win64, + X86_64SysV, + X86RegCall, + AAPCS, + AAPCS_VFP, + IntelOclBicc, + SpirFunction, + OpenCLKernel, + Swift, + PreserveMost, + PreserveAll, + AArch64VectorCall, +}; + pub extern fn ZigClangSourceManager_getSpellingLoc(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) struct_ZigClangSourceLocation; pub extern fn ZigClangSourceManager_getFilename(self: *const struct_ZigClangSourceManager, SpellingLoc: struct_ZigClangSourceLocation) ?[*]const u8; pub extern fn ZigClangSourceManager_getSpellingLineNumber(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; @@ -832,27 +853,6 @@ pub const struct_ZigClangQualType = extern struct { ptr: ?*c_void, }; -pub const ZigClangCallingConv = extern enum { - C, - X86StdCall, - X86FastCall, - X86ThisCall, - X86VectorCall, - X86Pascal, - Win64, - X86_64SysV, - X86RegCall, - AAPCS, - AAPCS_VFP, - IntelOclBicc, - SpirFunction, - OpenCLKernel, - Swift, - PreserveMost, - PreserveAll, - AArch64VectorCall, -}; - pub const ZigClangStorageClass = extern enum { None, Extern, From 7f1dd05fa79bef8aba5f1cf697ff6866fca96617 Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Wed, 22 May 2019 15:30:08 +0200 Subject: [PATCH 05/10] clang.zig cleanup #4: move block around --- src-self-hosted/clang.zig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index 1edd5690a..413d745d3 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -669,6 +669,15 @@ pub const ZigClangCallingConv = extern enum { AArch64VectorCall, }; +pub const ZigClangStorageClass = extern enum { + None, + Extern, + Static, + PrivateExtern, + Auto, + Register, +}; + pub extern fn ZigClangSourceManager_getSpellingLoc(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) struct_ZigClangSourceLocation; pub extern fn ZigClangSourceManager_getFilename(self: *const struct_ZigClangSourceManager, SpellingLoc: struct_ZigClangSourceLocation) ?[*]const u8; pub extern fn ZigClangSourceManager_getSpellingLineNumber(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; @@ -853,15 +862,6 @@ pub const struct_ZigClangQualType = extern struct { ptr: ?*c_void, }; -pub const ZigClangStorageClass = extern enum { - None, - Extern, - Static, - PrivateExtern, - Auto, - Register, -}; - pub const ZigClangCompoundStmt_const_body_iterator = [*c]const *struct_ZigClangStmt; pub extern fn ZigClangCompoundStmt_body_begin(self: *const ZigClangCompoundStmt) ZigClangCompoundStmt_const_body_iterator; From fd9e63da53afc1cf2a62c194a0d2ffaa93ef4709 Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Wed, 22 May 2019 15:32:51 +0200 Subject: [PATCH 06/10] clang.zig cleanup #5: add missing enums --- src-self-hosted/clang.zig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index 413d745d3..206e78533 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -678,6 +678,22 @@ pub const ZigClangStorageClass = extern enum { Register, }; +pub const ZigClangAPFloat_roundingMode = extern enum { + NearestTiesToEven, + TowardPositive, + TowardNegative, + TowardZero, + NearestTiesToAway, +}; + +pub const ZigClangStringLiteral_StringKind = extern enum { + Ascii, + Wide, + UTF8, + UTF16, + UTF32, +}; + pub extern fn ZigClangSourceManager_getSpellingLoc(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) struct_ZigClangSourceLocation; pub extern fn ZigClangSourceManager_getFilename(self: *const struct_ZigClangSourceManager, SpellingLoc: struct_ZigClangSourceLocation) ?[*]const u8; pub extern fn ZigClangSourceManager_getSpellingLineNumber(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; From f4b4ea402e5de38b7a27e02e32852b2505ca408c Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Wed, 22 May 2019 15:35:31 +0200 Subject: [PATCH 07/10] clang.zig cleanup #6: move block around --- src-self-hosted/clang.zig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index 206e78533..910761f14 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -861,6 +861,11 @@ pub const Stage2ErrorMsg = extern struct { // byte offset into source offset: c_uint, }; + +pub const struct_ZigClangQualType = extern struct { + ptr: ?*c_void, +}; + pub extern fn ZigClangErrorMsg_delete(ptr: [*c]Stage2ErrorMsg, len: usize) void; pub extern fn ZigClangLoadFromCommandLine( @@ -874,10 +879,6 @@ pub extern fn ZigClangLoadFromCommandLine( pub extern fn ZigClangDecl_getKind(decl: *const ZigClangDecl) ZigClangDeclKind; pub extern fn ZigClangDecl_getDeclKindName(decl: *const struct_ZigClangDecl) [*]const u8; -pub const struct_ZigClangQualType = extern struct { - ptr: ?*c_void, -}; - pub const ZigClangCompoundStmt_const_body_iterator = [*c]const *struct_ZigClangStmt; pub extern fn ZigClangCompoundStmt_body_begin(self: *const ZigClangCompoundStmt) ZigClangCompoundStmt_const_body_iterator; From b639447263e89b2d23b3c1857f0e766207152591 Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Wed, 22 May 2019 15:36:07 +0200 Subject: [PATCH 08/10] clang.zig cleanup #7: add missing struct --- src-self-hosted/clang.zig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index 910761f14..21e2f5a41 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -866,6 +866,12 @@ pub const struct_ZigClangQualType = extern struct { ptr: ?*c_void, }; +pub const struct_ZigClangAPValueLValueBase = extern struct { + Ptr: ?*c_void, + CallIndex: c_uint, + Version: c_uint, +}; + pub extern fn ZigClangErrorMsg_delete(ptr: [*c]Stage2ErrorMsg, len: usize) void; pub extern fn ZigClangLoadFromCommandLine( From 8d50d4f3fcf23e1960e2f63e439e71a0e6d52640 Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Wed, 22 May 2019 15:41:44 +0200 Subject: [PATCH 09/10] clang.zig cleanup #8: add missing consts --- src-self-hosted/clang.zig | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index 21e2f5a41..8be1d362c 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -13,7 +13,7 @@ pub const struct_ZigClangCStyleCastExpr = @OpaqueType(); pub const struct_ZigClangCallExpr = @OpaqueType(); pub const struct_ZigClangCaseStmt = @OpaqueType(); pub const struct_ZigClangCompoundAssignOperator = @OpaqueType(); -pub const ZigClangCompoundStmt = @OpaqueType(); +pub const struct_ZigClangCompoundStmt = @OpaqueType(); pub const struct_ZigClangConditionalOperator = @OpaqueType(); pub const struct_ZigClangConstantArrayType = @OpaqueType(); pub const struct_ZigClangContinueStmt = @OpaqueType(); @@ -34,7 +34,7 @@ pub const struct_ZigClangFieldDecl = @OpaqueType(); pub const struct_ZigClangFileID = @OpaqueType(); pub const struct_ZigClangForStmt = @OpaqueType(); pub const struct_ZigClangFullSourceLoc = @OpaqueType(); -pub const ZigClangFunctionDecl = @OpaqueType(); +pub const struct_ZigClangFunctionDecl = @OpaqueType(); pub const struct_ZigClangFunctionProtoType = @OpaqueType(); pub const struct_ZigClangIfStmt = @OpaqueType(); pub const struct_ZigClangImplicitCastExpr = @OpaqueType(); @@ -69,7 +69,7 @@ pub const struct_ZigClangUnaryOperator = @OpaqueType(); pub const struct_ZigClangValueDecl = @OpaqueType(); pub const struct_ZigClangVarDecl = @OpaqueType(); pub const struct_ZigClangWhileStmt = @OpaqueType(); -pub const ZigClangFunctionType = @OpaqueType(); +pub const struct_ZigClangFunctionType = @OpaqueType(); pub const struct_ZigClangPredefinedExpr = @OpaqueType(); pub const ZigClangBO = extern enum { @@ -776,6 +776,7 @@ pub const ZigClangQualType = struct_ZigClangQualType; pub const ZigClangAPValueLValueBase = struct_ZigClangAPValueLValueBase; pub const ZigClangAPValue = struct_ZigClangAPValue; pub const ZigClangAPSInt = struct_ZigClangAPSInt; +pub const ZigClangAPFloat = struct_ZigClangAPFloat; pub const ZigClangASTContext = struct_ZigClangASTContext; pub const ZigClangASTUnit = struct_ZigClangASTUnit; pub const ZigClangArraySubscriptExpr = struct_ZigClangArraySubscriptExpr; @@ -788,6 +789,7 @@ pub const ZigClangCStyleCastExpr = struct_ZigClangCStyleCastExpr; pub const ZigClangCallExpr = struct_ZigClangCallExpr; pub const ZigClangCaseStmt = struct_ZigClangCaseStmt; pub const ZigClangCompoundAssignOperator = struct_ZigClangCompoundAssignOperator; +pub const ZigClangCompoundStmt = struct_ZigClangCompoundStmt; pub const ZigClangConditionalOperator = struct_ZigClangConditionalOperator; pub const ZigClangConstantArrayType = struct_ZigClangConstantArrayType; pub const ZigClangContinueStmt = struct_ZigClangContinueStmt; @@ -808,6 +810,7 @@ pub const ZigClangFieldDecl = struct_ZigClangFieldDecl; pub const ZigClangFileID = struct_ZigClangFileID; pub const ZigClangForStmt = struct_ZigClangForStmt; pub const ZigClangFullSourceLoc = struct_ZigClangFullSourceLoc; +pub const ZigClangFunctionDecl = struct_ZigClangFunctionDecl; pub const ZigClangFunctionProtoType = struct_ZigClangFunctionProtoType; pub const ZigClangIfStmt = struct_ZigClangIfStmt; pub const ZigClangImplicitCastExpr = struct_ZigClangImplicitCastExpr; @@ -842,6 +845,8 @@ pub const ZigClangUnaryOperator = struct_ZigClangUnaryOperator; pub const ZigClangValueDecl = struct_ZigClangValueDecl; pub const ZigClangVarDecl = struct_ZigClangVarDecl; pub const ZigClangWhileStmt = struct_ZigClangWhileStmt; +pub const ZigClangFunctionType = struct_ZigClangFunctionType; +pub const ZigClangPredefinedExpr = struct_ZigClangPredefinedExpr; pub const struct_ZigClangSourceLocation = extern struct { ID: c_uint, From 6547468af60be75e4256805dd2bdff4b14688262 Mon Sep 17 00:00:00 2001 From: Gonzalo Diethelm Date: Tue, 28 May 2019 17:58:22 +0200 Subject: [PATCH 10/10] clang.zig cleanup #9: rename arg0 to self --- src-self-hosted/clang.zig | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src-self-hosted/clang.zig b/src-self-hosted/clang.zig index 8be1d362c..20a815cb7 100644 --- a/src-self-hosted/clang.zig +++ b/src-self-hosted/clang.zig @@ -694,41 +694,41 @@ pub const ZigClangStringLiteral_StringKind = extern enum { UTF32, }; -pub extern fn ZigClangSourceManager_getSpellingLoc(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) struct_ZigClangSourceLocation; +pub extern fn ZigClangSourceManager_getSpellingLoc(self: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) struct_ZigClangSourceLocation; pub extern fn ZigClangSourceManager_getFilename(self: *const struct_ZigClangSourceManager, SpellingLoc: struct_ZigClangSourceLocation) ?[*]const u8; -pub extern fn ZigClangSourceManager_getSpellingLineNumber(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; -pub extern fn ZigClangSourceManager_getSpellingColumnNumber(arg0: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; -pub extern fn ZigClangSourceManager_getCharacterData(arg0: ?*const struct_ZigClangSourceManager, SL: struct_ZigClangSourceLocation) [*c]const u8; -pub extern fn ZigClangASTContext_getPointerType(arg0: ?*const struct_ZigClangASTContext, T: struct_ZigClangQualType) struct_ZigClangQualType; -pub extern fn ZigClangASTUnit_getASTContext(arg0: ?*struct_ZigClangASTUnit) ?*struct_ZigClangASTContext; +pub extern fn ZigClangSourceManager_getSpellingLineNumber(self: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; +pub extern fn ZigClangSourceManager_getSpellingColumnNumber(self: ?*const struct_ZigClangSourceManager, Loc: struct_ZigClangSourceLocation) c_uint; +pub extern fn ZigClangSourceManager_getCharacterData(self: ?*const struct_ZigClangSourceManager, SL: struct_ZigClangSourceLocation) [*c]const u8; +pub extern fn ZigClangASTContext_getPointerType(self: ?*const struct_ZigClangASTContext, T: struct_ZigClangQualType) struct_ZigClangQualType; +pub extern fn ZigClangASTUnit_getASTContext(self: ?*struct_ZigClangASTUnit) ?*struct_ZigClangASTContext; pub extern fn ZigClangASTUnit_getSourceManager(self: *struct_ZigClangASTUnit) *struct_ZigClangSourceManager; pub extern fn ZigClangASTUnit_visitLocalTopLevelDecls(self: *struct_ZigClangASTUnit, context: ?*c_void, Fn: ?extern fn (?*c_void, *const struct_ZigClangDecl) bool) bool; pub extern fn ZigClangRecordType_getDecl(record_ty: ?*const struct_ZigClangRecordType) ?*const struct_ZigClangRecordDecl; pub extern fn ZigClangEnumType_getDecl(record_ty: ?*const struct_ZigClangEnumType) ?*const struct_ZigClangEnumDecl; pub extern fn ZigClangRecordDecl_getCanonicalDecl(record_decl: ?*const struct_ZigClangRecordDecl) ?*const struct_ZigClangTagDecl; -pub extern fn ZigClangEnumDecl_getCanonicalDecl(arg0: ?*const struct_ZigClangEnumDecl) ?*const struct_ZigClangTagDecl; -pub extern fn ZigClangTypedefNameDecl_getCanonicalDecl(arg0: ?*const struct_ZigClangTypedefNameDecl) ?*const struct_ZigClangTypedefNameDecl; -pub extern fn ZigClangRecordDecl_getDefinition(arg0: ?*const struct_ZigClangRecordDecl) ?*const struct_ZigClangRecordDecl; -pub extern fn ZigClangEnumDecl_getDefinition(arg0: ?*const struct_ZigClangEnumDecl) ?*const struct_ZigClangEnumDecl; -pub extern fn ZigClangRecordDecl_getLocation(arg0: ?*const struct_ZigClangRecordDecl) struct_ZigClangSourceLocation; -pub extern fn ZigClangEnumDecl_getLocation(arg0: ?*const struct_ZigClangEnumDecl) struct_ZigClangSourceLocation; -pub extern fn ZigClangTypedefNameDecl_getLocation(arg0: ?*const struct_ZigClangTypedefNameDecl) struct_ZigClangSourceLocation; +pub extern fn ZigClangEnumDecl_getCanonicalDecl(self: ?*const struct_ZigClangEnumDecl) ?*const struct_ZigClangTagDecl; +pub extern fn ZigClangTypedefNameDecl_getCanonicalDecl(self: ?*const struct_ZigClangTypedefNameDecl) ?*const struct_ZigClangTypedefNameDecl; +pub extern fn ZigClangRecordDecl_getDefinition(self: ?*const struct_ZigClangRecordDecl) ?*const struct_ZigClangRecordDecl; +pub extern fn ZigClangEnumDecl_getDefinition(self: ?*const struct_ZigClangEnumDecl) ?*const struct_ZigClangEnumDecl; +pub extern fn ZigClangRecordDecl_getLocation(self: ?*const struct_ZigClangRecordDecl) struct_ZigClangSourceLocation; +pub extern fn ZigClangEnumDecl_getLocation(self: ?*const struct_ZigClangEnumDecl) struct_ZigClangSourceLocation; +pub extern fn ZigClangTypedefNameDecl_getLocation(self: ?*const struct_ZigClangTypedefNameDecl) struct_ZigClangSourceLocation; pub extern fn ZigClangDecl_getLocation(self: *const ZigClangDecl) ZigClangSourceLocation; pub extern fn ZigClangRecordDecl_isUnion(record_decl: ?*const struct_ZigClangRecordDecl) bool; pub extern fn ZigClangRecordDecl_isStruct(record_decl: ?*const struct_ZigClangRecordDecl) bool; pub extern fn ZigClangRecordDecl_isAnonymousStructOrUnion(record_decl: ?*const struct_ZigClangRecordDecl) bool; -pub extern fn ZigClangEnumDecl_getIntegerType(arg0: ?*const struct_ZigClangEnumDecl) struct_ZigClangQualType; +pub extern fn ZigClangEnumDecl_getIntegerType(self: ?*const struct_ZigClangEnumDecl) struct_ZigClangQualType; pub extern fn ZigClangDecl_getName_bytes_begin(decl: ?*const struct_ZigClangDecl) [*c]const u8; pub extern fn ZigClangSourceLocation_eq(a: struct_ZigClangSourceLocation, b: struct_ZigClangSourceLocation) bool; -pub extern fn ZigClangTypedefType_getDecl(arg0: ?*const struct_ZigClangTypedefType) ?*const struct_ZigClangTypedefNameDecl; -pub extern fn ZigClangTypedefNameDecl_getUnderlyingType(arg0: ?*const struct_ZigClangTypedefNameDecl) struct_ZigClangQualType; -pub extern fn ZigClangQualType_getCanonicalType(arg0: struct_ZigClangQualType) struct_ZigClangQualType; +pub extern fn ZigClangTypedefType_getDecl(self: ?*const struct_ZigClangTypedefType) ?*const struct_ZigClangTypedefNameDecl; +pub extern fn ZigClangTypedefNameDecl_getUnderlyingType(self: ?*const struct_ZigClangTypedefNameDecl) struct_ZigClangQualType; +pub extern fn ZigClangQualType_getCanonicalType(self: struct_ZigClangQualType) struct_ZigClangQualType; pub extern fn ZigClangQualType_getTypePtr(self: struct_ZigClangQualType) *const struct_ZigClangType; -pub extern fn ZigClangQualType_addConst(arg0: [*c]struct_ZigClangQualType) void; -pub extern fn ZigClangQualType_eq(arg0: struct_ZigClangQualType, arg1: struct_ZigClangQualType) bool; -pub extern fn ZigClangQualType_isConstQualified(arg0: struct_ZigClangQualType) bool; -pub extern fn ZigClangQualType_isVolatileQualified(arg0: struct_ZigClangQualType) bool; -pub extern fn ZigClangQualType_isRestrictQualified(arg0: struct_ZigClangQualType) bool; +pub extern fn ZigClangQualType_addConst(self: [*c]struct_ZigClangQualType) void; +pub extern fn ZigClangQualType_eq(self: struct_ZigClangQualType, arg1: struct_ZigClangQualType) bool; +pub extern fn ZigClangQualType_isConstQualified(self: struct_ZigClangQualType) bool; +pub extern fn ZigClangQualType_isVolatileQualified(self: struct_ZigClangQualType) bool; +pub extern fn ZigClangQualType_isRestrictQualified(self: struct_ZigClangQualType) bool; pub extern fn ZigClangType_getTypeClass(self: ?*const struct_ZigClangType) ZigClangTypeClass; pub extern fn ZigClangType_isVoidType(self: ?*const struct_ZigClangType) bool; pub extern fn ZigClangType_getTypeClassName(self: *const struct_ZigClangType) [*]const u8; @@ -752,7 +752,7 @@ pub extern fn ZigClangAPSInt_free(self: ?*const struct_ZigClangAPSInt) void; pub extern fn ZigClangAPSInt_getRawData(self: ?*const struct_ZigClangAPSInt) [*c]const u64; pub extern fn ZigClangAPSInt_getNumWords(self: ?*const struct_ZigClangAPSInt) c_uint; pub extern fn ZigClangAPValueLValueBase_dyn_cast_Expr(self: struct_ZigClangAPValueLValueBase) ?*const struct_ZigClangExpr; -pub extern fn ZigClangASTUnit_delete(arg0: ?*struct_ZigClangASTUnit) void; +pub extern fn ZigClangASTUnit_delete(self: ?*struct_ZigClangASTUnit) void; pub extern fn ZigClangFunctionDecl_getType(self: *const ZigClangFunctionDecl) struct_ZigClangQualType; pub extern fn ZigClangFunctionDecl_getLocation(self: *const ZigClangFunctionDecl) struct_ZigClangSourceLocation;