Skip to content

Commit 85a9eb5

Browse files
liamappelbeliamappelbe
committed
Fix objc and swiftgen
1 parent 4dcd6f4 commit 85a9eb5

File tree

5 files changed

+395
-355
lines changed

5 files changed

+395
-355
lines changed

‎pkgs/objective_c/lib/src/c_bindings_generated.dart‎

Lines changed: 97 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -8,106 +8,151 @@
88
// coverage:ignore-file
99

1010
// AUTO GENERATED FILE, DO NOT EDIT.
11-
//
11+
//
1212
// Generated by `package:ffigen`.
1313
// ignore_for_file: type=lint, unused_import
1414
@ffi.DefaultAsset('package:objective_c/objective_c.dylib')
1515
library;
1616

1717
import 'dart:ffi' as ffi;
18-
@ffi.Native<ffi.Void Function(ffi.Pointer<ffi.Void> )>(symbol: 'DOBJC_awaitWaiter')
19-
external void awaitWaiter(ffi.Pointer<ffi.Void> waiter,
20-
);
21-
22-
@ffi.Native<ffi.Void Function(Dart_FinalizableHandle , ffi.Handle )>(symbol: 'DOBJC_deleteFinalizableHandle')
23-
external void deleteFinalizableHandle(Dart_FinalizableHandle handle,
24-
Object owner,
25-
);
2618

27-
@ffi.Native<ffi.Void Function(ffi.Pointer<ObjCBlockImpl> )>(symbol: 'DOBJC_disposeObjCBlockWithClosure')
28-
external void disposeObjCBlockWithClosure(ffi.Pointer<ObjCBlockImpl> block,
19+
@ffi.Native<ffi.Void Function(ffi.Pointer<ffi.Void>)>(
20+
symbol: 'DOBJC_awaitWaiter',
21+
)
22+
external void awaitWaiter(ffi.Pointer<ffi.Void> waiter);
23+
24+
@ffi.Native<ffi.Void Function(Dart_FinalizableHandle, ffi.Handle)>(
25+
symbol: 'DOBJC_deleteFinalizableHandle',
26+
)
27+
external void deleteFinalizableHandle(
28+
Dart_FinalizableHandle handle,
29+
Object owner,
2930
);
3031

31-
@ffi.Native<ffi.Pointer<DOBJC_Context> Function(ffi.Pointer<DOBJC_Context> )>(symbol: 'DOBJC_fillContext', isLeaf: true)
32-
external ffi.Pointer<DOBJC_Context> fillContext(ffi.Pointer<DOBJC_Context> context,
32+
@ffi.Native<ffi.Void Function(ffi.Pointer<ObjCBlockImpl>)>(
33+
symbol: 'DOBJC_disposeObjCBlockWithClosure',
34+
)
35+
external void disposeObjCBlockWithClosure(ffi.Pointer<ObjCBlockImpl> block);
36+
37+
@ffi.Native<ffi.Pointer<DOBJC_Context> Function(ffi.Pointer<DOBJC_Context>)>(
38+
symbol: 'DOBJC_fillContext',
39+
isLeaf: true,
40+
)
41+
external ffi.Pointer<DOBJC_Context> fillContext(
42+
ffi.Pointer<DOBJC_Context> context,
3343
);
3444

3545
/// Returns the MacOS/iOS version we're running on.
3646
@ffi.Native<_Version Function()>(symbol: 'DOBJC_getOsVesion', isLeaf: true)
3747
external _Version getOsVesion();
3848

39-
@ffi.Native<ffi.IntPtr Function(ffi.Pointer<ffi.Void> )>(symbol: 'DOBJC_initializeApi', isLeaf: true)
40-
external int initializeApi(ffi.Pointer<ffi.Void> data,
41-
);
42-
43-
@ffi.Native<ffi.Bool Function(ffi.Pointer<ObjCBlockImpl> )>(symbol: 'DOBJC_isValidBlock', isLeaf: true)
44-
external bool isValidBlock(ffi.Pointer<ObjCBlockImpl> block,
45-
);
46-
47-
@ffi.Native<ffi.Pointer<ffi.Bool> Function(ffi.Handle )>(symbol: 'DOBJC_newFinalizableBool')
48-
external ffi.Pointer<ffi.Bool> newFinalizableBool(Object owner,
49-
);
50-
51-
@ffi.Native<Dart_FinalizableHandle Function(ffi.Handle , ffi.Pointer<ObjCObjectImpl> )>(symbol: 'DOBJC_newFinalizableHandle')
52-
external Dart_FinalizableHandle newFinalizableHandle(Object owner,
53-
ffi.Pointer<ObjCObjectImpl> object,
49+
@ffi.Native<ffi.IntPtr Function(ffi.Pointer<ffi.Void>)>(
50+
symbol: 'DOBJC_initializeApi',
51+
isLeaf: true,
52+
)
53+
external int initializeApi(ffi.Pointer<ffi.Void> data);
54+
55+
@ffi.Native<ffi.Bool Function(ffi.Pointer<ObjCBlockImpl>)>(
56+
symbol: 'DOBJC_isValidBlock',
57+
isLeaf: true,
58+
)
59+
external bool isValidBlock(ffi.Pointer<ObjCBlockImpl> block);
60+
61+
@ffi.Native<ffi.Pointer<ffi.Bool> Function(ffi.Handle)>(
62+
symbol: 'DOBJC_newFinalizableBool',
63+
)
64+
external ffi.Pointer<ffi.Bool> newFinalizableBool(Object owner);
65+
66+
@ffi.Native<
67+
Dart_FinalizableHandle Function(ffi.Handle, ffi.Pointer<ObjCObjectImpl>)
68+
>(symbol: 'DOBJC_newFinalizableHandle')
69+
external Dart_FinalizableHandle newFinalizableHandle(
70+
Object owner,
71+
ffi.Pointer<ObjCObjectImpl> object,
5472
);
5573

56-
@ffi.Native<ffi.Pointer<ffi.Void> Function()>(symbol: 'DOBJC_newWaiter', isLeaf: true)
74+
@ffi.Native<ffi.Pointer<ffi.Void> Function()>(
75+
symbol: 'DOBJC_newWaiter',
76+
isLeaf: true,
77+
)
5778
external ffi.Pointer<ffi.Void> newWaiter();
5879

59-
@ffi.Native<ffi.Void Function(ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> )>> , ffi.Pointer<ffi.Void> )>(symbol: 'DOBJC_runOnMainThread', isLeaf: true)
60-
external void runOnMainThread(ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> )>> fn,
61-
ffi.Pointer<ffi.Void> arg,
80+
@ffi.Native<
81+
ffi.Void Function(
82+
ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>,
83+
ffi.Pointer<ffi.Void>,
84+
)
85+
>(symbol: 'DOBJC_runOnMainThread', isLeaf: true)
86+
external void runOnMainThread(
87+
ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>> fn,
88+
ffi.Pointer<ffi.Void> arg,
6289
);
6390

64-
@ffi.Native<ffi.Void Function(ffi.Pointer<ffi.Void> )>(symbol: 'DOBJC_signalWaiter', isLeaf: true)
65-
external void signalWaiter(ffi.Pointer<ffi.Void> waiter,
66-
);
91+
@ffi.Native<ffi.Void Function(ffi.Pointer<ffi.Void>)>(
92+
symbol: 'DOBJC_signalWaiter',
93+
isLeaf: true,
94+
)
95+
external void signalWaiter(ffi.Pointer<ffi.Void> waiter);
6796

68-
final class DOBJC_Context extends ffi.Struct{
97+
final class DOBJC_Context extends ffi.Struct {
6998
@ffi.Int64()
7099
external int version;
71100

72-
external ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>> newWaiter$1;
101+
external ffi.Pointer<ffi.NativeFunction<ffi.Pointer<ffi.Void> Function()>>
102+
newWaiter$1;
73103

74-
external ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> )>> awaitWaiter$1;
104+
external ffi.Pointer<
105+
ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>
106+
>
107+
awaitWaiter$1;
75108

76-
external ffi.Pointer<ffi.NativeFunction<ffi.Pointer<_Dart_Isolate> Function()>> currentIsolate;
109+
external ffi.Pointer<
110+
ffi.NativeFunction<ffi.Pointer<_Dart_Isolate> Function()>
111+
>
112+
currentIsolate;
77113

78-
external ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<_Dart_Isolate> )>> enterIsolate;
114+
external ffi.Pointer<
115+
ffi.NativeFunction<ffi.Void Function(ffi.Pointer<_Dart_Isolate>)>
116+
>
117+
enterIsolate;
79118

80119
external ffi.Pointer<ffi.NativeFunction<ffi.Void Function()>> exitIsolate;
81120

82121
external ffi.Pointer<ffi.NativeFunction<ffi.Int64 Function()>> getMainPortId;
83122

84-
external ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Int64 )>> getCurrentThreadOwnsIsolate;
85-
123+
external ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Int64)>>
124+
getCurrentThreadOwnsIsolate;
86125
}
87126

88127
typedef Dart_FinalizableHandle = ffi.Pointer<Dart_FinalizableHandle_>;
89-
final class Dart_FinalizableHandle_ extends ffi.Opaque{
90-
}
91128

129+
final class Dart_FinalizableHandle_ extends ffi.Opaque {}
92130

93131
const int ILLEGAL_PORT = 0;
94132

95-
final class ObjCBlockDesc extends ffi.Struct{
133+
final class ObjCBlockDesc extends ffi.Struct {
96134
@ffi.UnsignedLong()
97135
external int reserved;
98136

99137
@ffi.UnsignedLong()
100138
external int size;
101139

102-
external ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> dst, ffi.Pointer<ffi.Void> src)>> copy_helper;
140+
external ffi.Pointer<
141+
ffi.NativeFunction<
142+
ffi.Void Function(ffi.Pointer<ffi.Void> dst, ffi.Pointer<ffi.Void> src)
143+
>
144+
>
145+
copy_helper;
103146

104-
external ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> src)>> dispose_helper;
147+
external ffi.Pointer<
148+
ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void> src)>
149+
>
150+
dispose_helper;
105151

106152
external ffi.Pointer<ffi.Char> signature;
107-
108153
}
109154

110-
final class ObjCBlockImpl extends ffi.Struct{
155+
final class ObjCBlockImpl extends ffi.Struct {
111156
external ffi.Pointer<ffi.Void> isa;
112157

113158
@ffi.Int()
@@ -124,16 +169,13 @@ final class ObjCBlockImpl extends ffi.Struct{
124169

125170
@ffi.Int64()
126171
external int dispose_port;
127-
128172
}
129173

130-
final class ObjCObjectImpl extends ffi.Opaque{
131-
}
174+
final class ObjCObjectImpl extends ffi.Opaque {}
132175

133-
final class _Dart_Isolate extends ffi.Opaque{
134-
}
176+
final class _Dart_Isolate extends ffi.Opaque {}
135177

136-
final class _Version extends ffi.Struct{
178+
final class _Version extends ffi.Struct {
137179
@ffi.Int()
138180
external int major;
139181

@@ -142,6 +184,4 @@ final class _Version extends ffi.Struct{
142184

143185
@ffi.Int()
144186
external int patch;
145-
146187
}
147-

0 commit comments

Comments
 (0)