Implement transformation in transform_variable.dart

Author: AmrAhmed119

pkgs/swift2objc/lib/src/ast/_core/interfaces/function_declaration.dart

@@ -20,5 +20,4 @@ abstract interface class FunctionDeclaration
         CanThrow,
         CanAsync {
   abstract final ReferredType returnType;
-  abstract final bool isCallingProperty;
 }

pkgs/swift2objc/lib/src/ast/declarations/compounds/members/method_declaration.dart

@@ -43,9 +43,6 @@ class MethodDeclaration extends AstNode
   @override
   ReferredType returnType;
 
-  @override
-  bool isCallingProperty;
-
   bool isStatic;
 
   String get fullName => [
@@ -65,7 +62,6 @@ class MethodDeclaration extends AstNode
     this.isOverriding = false,
     this.throws = false,
     this.async = false,
-    this.isCallingProperty = false,
   }) : assert(!isStatic || !isOverriding);
 
   @override

pkgs/swift2objc/lib/src/ast/declarations/globals/globals.dart

@@ -46,9 +46,6 @@ class GlobalFunctionDeclaration extends AstNode implements FunctionDeclaration {
   @override
   List<String> statements;
 
-  @override
-  bool isCallingProperty;
-
   GlobalFunctionDeclaration({
     required this.id,
     required this.name,
@@ -58,7 +55,6 @@ class GlobalFunctionDeclaration extends AstNode implements FunctionDeclaration {
     this.statements = const [],
     this.throws = false,
     this.async = false,
-    this.isCallingProperty = false,
   });
 
   @override

pkgs/swift2objc/lib/src/parser/parsers/declaration_parsers/parse_variable_declaration.dart

@@ -72,11 +72,7 @@ bool _parseVariableIsConstant(Json variableSymbolJson) {
 bool _parseVariableThrows(Json json) {
   final throws = json['declarationFragments']
       .any((frag) => matchFragment(frag, 'keyword', 'throws'));
-  if (throws) {
-    // getters.
-    return true;
-  }
-  return false;
+  return throws;
 }
 
 bool _parseVariableAsync(Json json) {

pkgs/swift2objc/lib/src/transformer/transformers/transform_compound.dart

@@ -52,17 +52,15 @@ ClassDeclaration transformCompound(
   transformedCompound.nestedDeclarations
       .fillNestingParents(transformedCompound);
 
-  transformedCompound.properties = originalCompound.properties
-      .where((property) => !property.throws)
+  final transformedProperties = originalCompound.properties
       .map((property) => transformProperty(
             property,
             wrappedCompoundInstance,
             parentNamer,
             transformationMap,
           ))
       .nonNulls
-      .toList()
-    ..sort((Declaration a, Declaration b) => a.id.compareTo(b.id));
+      .toList();
 
   transformedCompound.initializers = originalCompound.initializers
       .map((initializer) => transformInitializer(
@@ -74,18 +72,25 @@ ClassDeclaration transformCompound(
       .toList()
     ..sort((Declaration a, Declaration b) => a.id.compareTo(b.id));
 
-  transformedCompound.methods = (originalCompound.methods +
-          _convertPropertiesToMethods(originalCompound.properties))
+  final transformedMethods = originalCompound.methods
       .map((method) => transformMethod(
             method,
             wrappedCompoundInstance,
             parentNamer,
             transformationMap,
           ))
       .nonNulls
+      .toList();
+
+  transformedCompound.properties = transformedProperties
+      .whereType<PropertyDeclaration>()
       .toList()
     ..sort((Declaration a, Declaration b) => a.id.compareTo(b.id));
 
+  transformedCompound.methods = (transformedMethods +
+      transformedProperties.whereType<MethodDeclaration>().toList())
+    ..sort((Declaration a, Declaration b) => a.id.compareTo(b.id));
+
   return transformedCompound;
 }
 
@@ -109,23 +114,3 @@ InitializerDeclaration _buildWrapperInitializer(
     hasObjCAnnotation: wrappedClassInstance.hasObjCAnnotation,
   );
 }
-
-List<MethodDeclaration> _convertPropertiesToMethods(
-  List<PropertyDeclaration> properties,
-) {
-  return properties
-      .where((property) => property.throws)
-      .map((property) => MethodDeclaration(
-            id: property.id,
-            name: property.name,
-            returnType: property.type,
-            params: [],
-            hasObjCAnnotation: true,
-            statements: property.getter?.statements ?? [],
-            isStatic: property.isStatic,
-            throws: property.throws,
-            async: property.async,
-            isCallingProperty: true,
-          ))
-      .toList();
-}

pkgs/swift2objc/lib/src/transformer/transformers/transform_function.dart

@@ -39,8 +39,7 @@ MethodDeclaration? transformMethod(
       final methodSource = originalMethod.isStatic
           ? wrappedClassInstance.type.swiftType
           : wrappedClassInstance.name;
-      return '$methodSource.${originalMethod.name}'
-          '${originalMethod.isCallingProperty ? '' : '($arguments)'}';
+      return '$methodSource.${originalMethod.name}($arguments)';
     },
   );
 }
@@ -57,8 +56,8 @@ MethodDeclaration transformGlobalFunction(
     wrapperMethodName: globalNamer.makeUnique(
       '${globalFunction.name}Wrapper',
     ),
-    originalCallStatementGenerator: (arguments) => '${globalFunction.name}'
-        '${globalFunction.isCallingProperty ? '' : '($arguments)'}',
+    originalCallStatementGenerator: (arguments) =>
+        '${globalFunction.name}($arguments)',
   );
 }
 

pkgs/swift2objc/lib/src/transformer/transformers/transform_globals.dart

@@ -1,6 +1,8 @@
 import '../../ast/_core/interfaces/declaration.dart';
 import '../../ast/declarations/built_in/built_in_declaration.dart';
 import '../../ast/declarations/compounds/class_declaration.dart';
+import '../../ast/declarations/compounds/members/method_declaration.dart';
+import '../../ast/declarations/compounds/members/property_declaration.dart';
 import '../../ast/declarations/globals/globals.dart';
 import '../../parser/_core/utils.dart';
 import '../_core/unique_namer.dart';
@@ -21,41 +23,30 @@ ClassDeclaration transformGlobals(
     isWrapper: true,
   );
 
-  transformedGlobals.properties = globals.variables
-      .where((variable) => !variable.throws)
+  final transformedProperties = globals.variables
       .map((variable) => transformGlobalVariable(
             variable,
             globalNamer,
             transformationMap,
           ))
+      .toList();
+
+  final transformedMethods = globals.functions
+      .map((function) => transformGlobalFunction(
+            function,
+            globalNamer,
+            transformationMap,
+          ))
+      .toList();
+
+  transformedGlobals.properties = transformedProperties
+      .whereType<PropertyDeclaration>()
       .toList()
     ..sort((Declaration a, Declaration b) => a.id.compareTo(b.id));
 
-  transformedGlobals.methods =
-      (globals.functions + _convertVariablesToFunctions(globals.variables))
-          .map((function) => transformGlobalFunction(
-                function,
-                globalNamer,
-                transformationMap,
-              ))
-          .toList()
-        ..sort((Declaration a, Declaration b) => a.id.compareTo(b.id));
+  transformedGlobals.methods = (transformedMethods +
+      transformedProperties.whereType<MethodDeclaration>().toList())
+    ..sort((Declaration a, Declaration b) => a.id.compareTo(b.id));
 
   return transformedGlobals;
 }
-
-List<GlobalFunctionDeclaration> _convertVariablesToFunctions(
-  List<GlobalVariableDeclaration> variables,
-) {
-  return variables
-      .where((variable) => variable.throws)
-      .map((variable) => GlobalFunctionDeclaration(
-            id: variable.id,
-            name: variable.name,
-            params: [],
-            returnType: variable.type,
-            throws: variable.throws,
-            isCallingProperty: true,
-          ))
-      .toList();
-}

pkgs/swift2objc/lib/src/transformer/transformers/transform_variable.dart

@@ -1,4 +1,6 @@
+import '../../ast/_core/interfaces/declaration.dart';
 import '../../ast/_core/interfaces/variable_declaration.dart';
+import '../../ast/declarations/compounds/members/method_declaration.dart';
 import '../../ast/declarations/compounds/members/property_declaration.dart';
 import '../../ast/declarations/globals/globals.dart';
 import '../_core/unique_namer.dart';
@@ -13,7 +15,7 @@ import 'transform_referred_type.dart';
 // through the wrapped class instance in the wrapper class. In global variable
 // case, it can be  referenced directly since it's not a member of any entity.
 
-PropertyDeclaration? transformProperty(
+Declaration? transformProperty(
   PropertyDeclaration originalProperty,
   PropertyDeclaration wrappedClassInstance,
   UniqueNamer globalNamer,
@@ -36,7 +38,7 @@ PropertyDeclaration? transformProperty(
   );
 }
 
-PropertyDeclaration transformGlobalVariable(
+Declaration transformGlobalVariable(
   GlobalVariableDeclaration globalVariable,
   UniqueNamer globalNamer,
   TransformationMap transformationMap,
@@ -54,7 +56,7 @@ PropertyDeclaration transformGlobalVariable(
 
 // -------------------------- Core Implementation --------------------------
 
-PropertyDeclaration _transformVariable(
+Declaration _transformVariable(
   VariableDeclaration originalVariable,
   UniqueNamer globalNamer,
   TransformationMap transformationMap, {
@@ -71,6 +73,25 @@ PropertyDeclaration _transformVariable(
       ? originalVariable.hasSetter
       : !originalVariable.isConstant;
 
+  if (originalVariable.throws) {
+    return MethodDeclaration(
+      id: originalVariable.id,
+      name: wrapperPropertyName,
+      returnType: transformedType,
+      params: [],
+      hasObjCAnnotation: true,
+      isStatic: originalVariable is PropertyDeclaration
+          ? originalVariable.isStatic
+          : true,
+      statements: [
+        'let result = try $variableReferenceExpression',
+        'return $transformedType(result)',
+      ],
+      throws: true,
+      async: originalVariable.async,
+    );
+  }
+
   final transformedProperty = PropertyDeclaration(
     id: originalVariable.id,
     name: wrapperPropertyName,