Skip to content

Commit 35f73e4

Browse files
andriydrukandriydruk
committed
Dev: revert emitEndOfBlock
1 parent 47dc343 commit 35f73e4

10 files changed

Lines changed: 61 additions & 64 deletions

‎compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,13 @@ private void generateJavaSwift(Filer filer) throws IOException {
279279
swiftWriter.emitStatement("@_silgen_name(\"Java_com_readdle_codegen_anotation_JavaSwift_init\")");
280280
swiftWriter.emitStatement("public func Java_com_readdle_codegen_anotation_JavaBridgeable_init(env: UnsafeMutablePointer<JNIEnv?>, clazz: jclass) {");
281281
swiftWriter.emitStatement("JavaCoderConfig.RegisterBasicJavaTypes()");
282-
swiftWriter.emitEndOfBlock();
282+
swiftWriter.emitStatement("}");
283283

284284
// TODO: move to sample project
285285
swiftWriter.emitStatement("@_silgen_name(\"Java_com_readdle_codegen_anotation_JavaSwift_dumpReferenceTables\")");
286286
swiftWriter.emitStatement("public func Java_com_readdle_codegen_anotation_JavaBridgeable_dumpReferenceTables(env: UnsafeMutablePointer<JNIEnv?>, clazz: jclass) {");
287287
swiftWriter.emitStatement("JNI.dumpReferenceTables()");
288-
swiftWriter.emitEndOfBlock();
288+
swiftWriter.emitStatement("}");
289289

290290
swiftWriter.close();
291291
}

‎compiler/src/main/java/com/readdle/codegen/SwiftBlockDescriptor.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,24 +125,24 @@ File generateCode() throws IOException {
125125
swiftWriter.emitStatement("public init(jniObject: jobject) {");
126126
// TODO: throw exception
127127
swiftWriter.emitStatement("self.jniObject = JNI.api.NewGlobalRef(JNI.env, jniObject)!");
128-
swiftWriter.emitEndOfBlock();
128+
swiftWriter.emitStatement("}");
129129

130130
swiftWriter.emitEmptyLine();
131131
swiftWriter.emitStatement("deinit {");
132132
swiftWriter.emitStatement("JNI.api.DeleteGlobalRef(JNI.env, jniObject)");
133-
swiftWriter.emitEndOfBlock();
133+
swiftWriter.emitStatement("}");
134134

135135
swiftWriter.emitEmptyLine();
136136
swiftWriter.emitStatement("// Create swift object");
137137
swiftWriter.emitStatement(String.format("public static func from(javaObject: jobject) throws -> %s {", simpleTypeName));
138138
swiftWriter.emitStatement(String.format("return %s(jniObject: javaObject).block", swiftType));
139-
swiftWriter.emitEndOfBlock();
139+
swiftWriter.emitStatement("}");
140140

141141
swiftWriter.emitEmptyLine();
142142
swiftWriter.emitStatement("// Create java object with native pointer");
143143
swiftWriter.emitStatement("public func javaObject() throws -> jobject {");
144144
swiftWriter.emitStatement("return jniObject");
145-
swiftWriter.emitEndOfBlock();
145+
swiftWriter.emitStatement("}");
146146

147147
swiftWriter.emitEmptyLine();
148148
swiftWriter.emitStatement(String.format("static let javaMethod%1$s = try! JNI.getJavaMethod(forClass:\"%2$s\", method: \"%1$s\", sig: \"%3$s\")",
@@ -166,13 +166,13 @@ File generateCode() throws IOException {
166166
swiftWriter.emitStatement(String.format("java_%s = try %s.javaObject()", param.name, param.name));
167167
swiftWriter.emitStatement("} else {");
168168
swiftWriter.emitStatement(String.format("java_%s = jnull()", param.name));
169-
swiftWriter.emitEndOfBlock();
169+
swiftWriter.emitStatement("}");
170170
} else {
171171
swiftWriter.emitStatement(String.format("java_%s = try $%s.javaObject()", param.name, i + ""));
172172
}
173173
}
174174

175-
swiftWriter.emitEndOfBlock();
175+
swiftWriter.emitStatement("}");
176176
swiftWriter.emitStatement("catch {");
177177
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
178178
if (returnSwiftType == null) {
@@ -181,7 +181,7 @@ File generateCode() throws IOException {
181181
} else {
182182
swiftWriter.emitStatement("fatalError(errorString)");
183183
}
184-
swiftWriter.emitEndOfBlock();
184+
swiftWriter.emitStatement("}");
185185
}
186186

187187
String jniMethodTemplate;
@@ -211,21 +211,21 @@ File generateCode() throws IOException {
211211
swiftWriter.emitStatement("throw error");
212212
swiftWriter.emitStatement("} else {");
213213
swiftWriter.emitStatement("fatalError(\"JavaException\")");
214-
swiftWriter.emitEndOfBlock();
214+
swiftWriter.emitStatement("}");
215215
}
216216
else {
217217
swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
218218
swiftWriter.emitStatement("fatalError(\"JavaException: \\(error) \")");
219219
swiftWriter.emitStatement("} else {");
220220
swiftWriter.emitStatement("fatalError(\"JavaException\")");
221-
swiftWriter.emitEndOfBlock();
221+
swiftWriter.emitStatement("}");
222222
}
223-
swiftWriter.emitEndOfBlock();
223+
swiftWriter.emitStatement("}");
224224

225225
if (returnSwiftType != null) {
226226
swiftWriter.emitStatement("do {");
227227
swiftWriter.emitStatement(String.format("return try %s.from(javaObject: result)", returnSwiftType.swiftConstructorType));
228-
swiftWriter.emitEndOfBlock();
228+
swiftWriter.emitStatement("}");
229229
swiftWriter.emitStatement("catch {");
230230
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
231231
if (returnSwiftType == null) {
@@ -235,10 +235,10 @@ File generateCode() throws IOException {
235235
else {
236236
swiftWriter.emitStatement("fatalError(errorString)");
237237
}
238-
swiftWriter.emitEndOfBlock();
238+
swiftWriter.emitStatement("}");
239239
}
240240

241-
swiftWriter.emitEndOfBlock();
241+
swiftWriter.emitStatement("}");
242242

243243
swiftWriter.emitEmptyLine();
244244

‎compiler/src/main/java/com/readdle/codegen/SwiftCallbackFuncDescriptor.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,23 +136,23 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
136136
for (SwiftParamDescriptor param : params) {
137137
swiftWriter.emitStatement(String.format("if let localRef = java%1$s as? jobject {", param.name));
138138
swiftWriter.emitStatement("JNI.DeleteLocalRef(localRef)");
139-
swiftWriter.emitEndOfBlock();
139+
swiftWriter.emitStatement("}");
140140
}
141-
swiftWriter.emitEndOfBlock();
141+
swiftWriter.emitStatement("}");
142142

143143
if (params.size() > 0) {
144144
swiftWriter.emitStatement("do {");
145145
for (SwiftParamDescriptor param : params) {
146146
if (param.isOptional) {
147147
swiftWriter.emitStatement(String.format("if let %1$s = %1$s {", param.name));
148148
swiftWriter.emitStatement(String.format("java%1$s = try %1$s.javaObject()", param.name));
149-
swiftWriter.emitEndOfBlock();
149+
swiftWriter.emitStatement("}");
150150
} else {
151151
swiftWriter.emitStatement(String.format("java%s = try %s.javaObject()", param.name, param.name));
152152
}
153153
}
154154

155-
swiftWriter.emitEndOfBlock();
155+
swiftWriter.emitStatement("}");
156156
swiftWriter.emitStatement("catch {");
157157
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
158158
if (returnSwiftType == null) {
@@ -164,7 +164,7 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
164164
} else {
165165
swiftWriter.emitStatement("fatalError(errorString)");
166166
}
167-
swiftWriter.emitEndOfBlock();
167+
swiftWriter.emitStatement("}");
168168
}
169169

170170
String jniMethodTemplate;
@@ -199,14 +199,14 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
199199
swiftWriter.emitStatement("throw error");
200200
swiftWriter.emitStatement("} else {");
201201
swiftWriter.emitStatement("fatalError(\"JavaException\")");
202-
swiftWriter.emitEndOfBlock();
202+
swiftWriter.emitStatement("}");
203203
}
204204
else {
205205
swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
206206
swiftWriter.emitStatement("fatalError(\"JavaException: \\(error) \")");
207207
swiftWriter.emitStatement("} else {");
208208
swiftWriter.emitStatement("fatalError(\"JavaException\")");
209-
swiftWriter.emitEndOfBlock();
209+
swiftWriter.emitStatement("}");
210210
}
211211
swiftWriter.emitStatement("} else {");
212212
if (isReturnTypeOptional) {
@@ -215,8 +215,8 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
215215
else {
216216
swiftWriter.emitStatement("fatalError(\"Don't support nil here!\")");
217217
}
218-
swiftWriter.emitEndOfBlock();
219-
swiftWriter.emitEndOfBlock();
218+
swiftWriter.emitStatement("}");
219+
swiftWriter.emitStatement("}");
220220
}
221221
else {
222222
swiftWriter.emit(")\n");
@@ -227,16 +227,16 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
227227
swiftWriter.emitStatement("throw error");
228228
swiftWriter.emitStatement("} else {");
229229
swiftWriter.emitStatement("fatalError(\"JavaException\")");
230-
swiftWriter.emitEndOfBlock();
230+
swiftWriter.emitStatement("}");
231231
}
232232
else {
233233
swiftWriter.emitStatement("if let error = try? NSError.from(javaObject: throwable) {");
234234
swiftWriter.emitStatement("fatalError(\"JavaException: \\(error) \")");
235235
swiftWriter.emitStatement("} else {");
236236
swiftWriter.emitStatement("fatalError(\"JavaException\")");
237-
swiftWriter.emitEndOfBlock();
237+
swiftWriter.emitStatement("}");
238238
}
239-
swiftWriter.emitEndOfBlock();
239+
swiftWriter.emitStatement("}");
240240
}
241241

242242
if (returnSwiftType != null) {
@@ -245,7 +245,7 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
245245
swiftWriter.emitStatement("}");
246246
swiftWriter.emitStatement("do {");
247247
swiftWriter.emitStatement(String.format("return try %s.from(javaObject: result)", returnSwiftType.swiftConstructorType));
248-
swiftWriter.emitEndOfBlock();
248+
swiftWriter.emitStatement("}");
249249
swiftWriter.emitStatement("catch {");
250250
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
251251
if (returnSwiftType == null) {
@@ -255,10 +255,10 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
255255
else {
256256
swiftWriter.emitStatement("fatalError(errorString)");
257257
}
258-
swiftWriter.emitEndOfBlock();
258+
swiftWriter.emitStatement("}");
259259
}
260260

261-
swiftWriter.emitEndOfBlock();
261+
swiftWriter.emitStatement("}");
262262

263263
swiftWriter.emitEmptyLine();
264264
}

‎compiler/src/main/java/com/readdle/codegen/SwiftDelegateDescriptor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,40 +196,40 @@ File generateCode() throws IOException {
196196
swiftWriter.emitStatement("public init(jniObject: jobject) {");
197197
// TODO: throw exception
198198
swiftWriter.emitStatement("self.jniObject = JNI.api.NewGlobalRef(JNI.env, jniObject)!");
199-
swiftWriter.emitEndOfBlock();
199+
swiftWriter.emitStatement("}");
200200

201201
swiftWriter.emitEmptyLine();
202202
swiftWriter.emitStatement("deinit {");
203203
swiftWriter.emitStatement("JNI.api.DeleteGlobalRef(JNI.env, jniObject)");
204-
swiftWriter.emitEndOfBlock();
204+
swiftWriter.emitStatement("}");
205205

206206
if (isInterface) {
207207
swiftWriter.emitEmptyLine();
208208
swiftWriter.emitStatement("// Create swift object");
209209
swiftWriter.emitStatement(String.format("public static func from(javaObject: jobject) throws -> %s {", simpleTypeName));
210210
swiftWriter.emitStatement(String.format("return %s(jniObject: javaObject)", simpleTypeName));
211-
swiftWriter.emitEndOfBlock();
211+
swiftWriter.emitStatement("}");
212212
}
213213
else {
214214
swiftWriter.emitEmptyLine();
215215
swiftWriter.emitStatement("// Get swift object from pointer");
216216
swiftWriter.emitStatement(String.format("public static func from(javaObject: jobject) throws -> %s {", simpleTypeName));
217217
swiftWriter.emitStatement("guard let pointer = UnsafeRawPointer(bitPattern: Int(JNI.api.GetLongField(JNI.env, javaObject, javaSwiftPointerFiled))) else {\nthrow NSError(domain: \"NullPointerException\", code: 1)\n}");
218218
swiftWriter.emitStatement(String.format("return Unmanaged<%s>.fromOpaque(pointer).takeUnretainedValue()", simpleTypeName));
219-
swiftWriter.emitEndOfBlock();
219+
swiftWriter.emitStatement("}");
220220

221221
swiftWriter.emitEmptyLine();
222222
swiftWriter.emitStatement("// Unbalance release");
223223
swiftWriter.emitStatement("public func release() {");
224224
swiftWriter.emitStatement("Unmanaged.passUnretained(self).release()");
225-
swiftWriter.emitEndOfBlock();
225+
swiftWriter.emitStatement("}");
226226
}
227227

228228
swiftWriter.emitEmptyLine();
229229
swiftWriter.emitStatement("// Create java object with native pointer");
230230
swiftWriter.emitStatement("public func javaObject() throws -> jobject {");
231231
swiftWriter.emitStatement("return jniObject");
232-
swiftWriter.emitEndOfBlock();
232+
swiftWriter.emitStatement("}");
233233

234234
for (SwiftCallbackFuncDescriptor function : callbackFunctions) {
235235
function.generateCode(swiftWriter, javaFullName, simpleTypeName);
@@ -245,7 +245,7 @@ File generateCode() throws IOException {
245245
swiftWriter.emitStatement(String.format("let swiftSelf = %s(jniObject: this)", simpleTypeName));
246246
swiftWriter.emitStatement("let nativePointer = jlong(Int(bitPattern: Unmanaged.passRetained(swiftSelf).toOpaque()))");
247247
swiftWriter.emitStatement("JNI.api.SetLongField(JNI.env, this, javaSwiftPointerFiled, nativePointer)");
248-
swiftWriter.emitEndOfBlock();
248+
swiftWriter.emitStatement("}");
249249
}
250250

251251
for (SwiftFuncDescriptor function : functions) {

‎compiler/src/main/java/com/readdle/codegen/SwiftFuncDescriptor.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,20 +117,20 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
117117
swiftWriter.emitStatement(String.format("%1$s = try %2$s.from(javaObject: j%1$s)", param.name, param.swiftType.swiftConstructorType));
118118
swiftWriter.emitStatement("} else {");
119119
swiftWriter.emitStatement(String.format("%s = nil", param.name));
120-
swiftWriter.emitEndOfBlock();
120+
swiftWriter.emitStatement("}");
121121
}
122122
else {
123123
swiftWriter.emitStatement(String.format("%1$s = try %2$s.from(javaObject: j%1$s)", param.name, param.swiftType.swiftConstructorType));
124124
}
125125
}
126126

127127
if (shouldCatchPreamble) {
128-
swiftWriter.emitEndOfBlock();
128+
swiftWriter.emitStatement("}");
129129
swiftWriter.emitStatement("catch {");
130130
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
131131
swiftWriter.emitStatement("_ = JNI.api.ThrowNew(JNI.env, SwiftRuntimeErrorClass, errorString)");
132132
swiftWriter.emitStatement(String.format("return%s", returnSwiftType != null ? " nil" : ""));
133-
swiftWriter.emitEndOfBlock();
133+
swiftWriter.emitStatement("}");
134134
}
135135

136136
if (isThrown) {
@@ -162,24 +162,24 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
162162
else {
163163
swiftWriter.emitStatement("return try result.javaObject()");
164164
}
165-
swiftWriter.emitEndOfBlock();
165+
swiftWriter.emitStatement("}");
166166
swiftWriter.emitStatement("catch {");
167167
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
168168
swiftWriter.emitStatement("_ = JNI.api.ThrowNew(JNI.env, SwiftRuntimeErrorClass, errorString)");
169169
swiftWriter.emitStatement("return nil");
170-
swiftWriter.emitEndOfBlock();
170+
swiftWriter.emitStatement("}");
171171
}
172172

173173
if (isThrown) {
174-
swiftWriter.emitEndOfBlock();
174+
swiftWriter.emitStatement("}");
175175
swiftWriter.emitStatement("catch {");
176176
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
177177
swiftWriter.emitStatement("_ = JNI.api.ThrowNew(JNI.env, SwiftErrorClass, errorString)");
178178
swiftWriter.emitStatement(String.format("return%s", returnSwiftType != null ? " nil" : ""));
179-
swiftWriter.emitEndOfBlock();
179+
swiftWriter.emitStatement("}");
180180
}
181181

182-
swiftWriter.emitEndOfBlock();
182+
swiftWriter.emitStatement("}");
183183

184184
swiftWriter.emitEmptyLine();
185185
}

‎compiler/src/main/java/com/readdle/codegen/SwiftGetterDescriptor.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
6161
swiftWriter.emitStatement(String.format("let swiftSelf: %s", swiftType));
6262
swiftWriter.emitStatement("do {");
6363
swiftWriter.emitStatement(String.format("swiftSelf = try %s.from(javaObject: this)", swiftType));
64-
swiftWriter.emitEndOfBlock();
64+
swiftWriter.emitStatement("}");
6565
swiftWriter.emitStatement("catch {");
6666
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
6767
swiftWriter.emitStatement("_ = JNI.api.ThrowNew(JNI.env, SwiftRuntimeErrorClass, errorString)");
6868
swiftWriter.emitStatement(String.format("return%s", returnSwiftType != null ? " nil" : ""));
69-
swiftWriter.emitEndOfBlock();
69+
swiftWriter.emitStatement("}");
7070
}
7171

7272
swiftWriter.emitStatement(String.format("let result = %s.%s", isStatic ? swiftType : "swiftSelf", swiftName));
@@ -79,15 +79,15 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
7979
else {
8080
swiftWriter.emitStatement("return try result.javaObject()");
8181
}
82-
swiftWriter.emitEndOfBlock();
82+
swiftWriter.emitStatement("}");
8383
swiftWriter.emitStatement("catch {");
8484
swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
8585
swiftWriter.emitStatement("_ = JNI.api.ThrowNew(JNI.env, SwiftRuntimeErrorClass, errorString)");
8686
swiftWriter.emitStatement("return nil");
87-
swiftWriter.emitEndOfBlock();
87+
swiftWriter.emitStatement("}");
8888
}
8989

90-
swiftWriter.emitEndOfBlock();
90+
swiftWriter.emitStatement("}");
9191

9292
swiftWriter.emitEmptyLine();
9393
}

0 commit comments

Comments
 (0)