fix: "+ (void)test:(int (^)(NSString *a))t;"

Author: yulingtianxia

lib/objc/DNObjectiveCContext.js

@@ -157,7 +157,7 @@ class DNArgumentContext extends DNContext {
         if (internal.name && internal.types) {
             this.name = internal.name.start.text
         }
-        this.type = null
+        this.type = ''
         this.isBlock = false   //user for block arguement
         this.isNullable = false
         this.isOutParam = false

lib/objc/DNObjectiveCParserListener.js

@@ -327,10 +327,26 @@ class DNObjectiveCParserListener extends ObjectiveCParserListener {
     enterBlockType(ctx) {
         if (this.currentContext instanceof DNMethodContext) {
             this.currentContext.returnType = 'Block'
+        } else if (this.currentContext instanceof DNArgumentContext) {
+            this.currentContext.isBlock = true
+            this.currentContext.blockRetType = null
+            this.currentContext.blockArgTypes = []
+            this.currentContext.blockArgNames = []
         }
     }
     // Exit a parse tree produced by ObjectiveCParser#blockType.
     exitBlockType(ctx) {
+        if (this.currentContext instanceof DNArgumentContext) {
+            var blockArgs = ''
+            this.currentContext.blockArgTypes.forEach((argType, index) => {
+                var argName = this.currentContext.blockArgNames[index]
+                if (argName && argType) {
+                    blockArgs += argType + ' ' + argName + ', '
+                }
+            })
+            blockArgs = '(' + blockArgs.substring(0, blockArgs.length - 2) + ')' // remove ', ' symbol
+            this.currentContext.type += this.currentContext.blockRetType + ' ' + this.currentContext.name + blockArgs
+        }
     }
     // Enter a parse tree produced by ObjectiveCParser#genericsSpecifier.
     enterGenericsSpecifier(ctx) {
@@ -377,25 +393,9 @@ class DNObjectiveCParserListener extends ObjectiveCParserListener {
     }
     // Enter a parse tree produced by ObjectiveCParser#blockParameters.
     enterBlockParameters(ctx) {
-        if (this.currentContext instanceof DNArgumentContext) {
-            this.currentContext.isBlock = true
-            this.currentContext.blockArgTypes = []
-            this.currentContext.blockArgNames = []
-        }
     }
     // Exit a parse tree produced by ObjectiveCParser#blockParameters.
     exitBlockParameters(ctx) {
-        if (this.currentContext instanceof DNArgumentContext) {
-            var blockArgs = ''
-            this.currentContext.blockArgTypes.forEach((argType, index) => {
-                var argName = this.currentContext.blockArgNames[index]
-                if (argName && argType) {
-                    blockArgs += argType + ' ' + argName + ', '
-                }
-            })
-            blockArgs = '(' + blockArgs.substring(0, blockArgs.length - 2) + ')' // remove ', ' symbol
-            this.currentContext.type += ' ' + this.currentContext.name + blockArgs
-        }
     }
     // Enter a parse tree produced by ObjectiveCParser#typeVariableDeclaratorOrName.
     enterTypeVariableDeclaratorOrName(ctx) {
@@ -754,8 +754,13 @@ class DNObjectiveCParserListener extends ObjectiveCParserListener {
             if (!this.currentContext.isBlock) {
                 let isArgInBlock = this.currentContext.parent instanceof DNBlockDefContext
                 this.currentContext.type = TC.convert(type, isArgInBlock)
-            }else {
-                this.currentContext.blockArgTypes.push(type)
+            } else {
+                let convertedType = TC.convert(type, true)
+                if (!this.currentContext.blockRetType) {
+                    this.currentContext.blockRetType = convertedType
+                } else {
+                    this.currentContext.blockArgTypes.push(convertedType)
+                }
             }
             // case：(NSError ** )error
             this.currentContext.isOutParam = isPointer2Pointer