Implement support for properties in Emscripten generator.

mono · Feb 5, 2023 · 64ea65f · 64ea65f
1 parent 732bfd7
commit 64ea65f
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 7 deletions.
diff --git a/src/Generator/Driver.cs b/src/Generator/Driver.cs
@@ -264,7 +264,12 @@ public void SetupPasses(ILibrary library)
 
             passes.AddPass(new CleanInvalidDeclNamesPass());
             passes.AddPass(new FastDelegateToDelegatesPass());
-            passes.AddPass(new FieldToPropertyPass());
+
+            if (Options.GeneratorKind != GeneratorKind.Emscripten)
+            {
+                passes.AddPass(new FieldToPropertyPass());
+            }
+
             passes.AddPass(new CheckIgnoredDeclsPass());
             passes.AddPass(new CheckFlagEnumsPass());
             passes.AddPass(new MakeProtectedNestedTypesPublicPass());

diff --git a/src/Generator/Generators/Emscripten/EmscriptenSources.cs b/src/Generator/Generators/Emscripten/EmscriptenSources.cs
@@ -125,9 +125,33 @@ public override bool VisitMethodDecl(Method method)
             return ret;
         }
 
+        public override bool VisitProperty(Property property)
+        {
+            if (property.Field != null)
+                return property.Field.Visit(this);
+
+            if (!property.GetMethod.IsConst)
+            {
+                Console.WriteLine($"Cannot bind non-const property getter method: {property.GetMethod.QualifiedOriginalName}");
+                return false;
+            }
+
+            var @class = property.Namespace as Class;
+            Indent();
+            Write($".property(\"{property.Name}\", &{@class.QualifiedOriginalName}::{property.GetMethod.OriginalName}");
+
+            if (property.HasSetter)
+                Write($", &{@class.QualifiedOriginalName}::{property.SetMethod.OriginalName}");
+
+            WriteLine(")");
+            Unindent();
+
+            return true;
+        }
+
         public override bool VisitFieldDecl(Field field)
         {
-            WriteLineIndent($".field(\"{field.Name}\", &{field.Class.QualifiedOriginalName}::{field.OriginalName})");
+            WriteLineIndent($".property(\"{field.Name}\", &{field.Class.QualifiedOriginalName}::{field.OriginalName})");
             return true;
         }
 

diff --git a/tests/Classes.h b/tests/Classes.h
@@ -4,18 +4,29 @@ class Class
 {
 public:
     void ReturnsVoid() {}
-    int ReturnsInt() { return 0; }
-    Class* PassAndReturnsClassPtr(Class* obj) { return obj; }
+    int ReturnsInt() const { return 0; }
+    Class *PassAndReturnsClassPtr(Class *obj) { return obj; }
 };
 
 class ClassWithField
 {
 public:
     ClassWithField() : Field(10) {}
     int Field;
-    int ReturnsField() { return Field; }
+    int ReturnsField() const { return Field; }
 };
 
+class ClassWithProperty
+{
+public:
+    ClassWithProperty() : Field(10) {}
+    int GetField() const { return Field; }
+    void SetField(int value) { Field = value; }
+private:
+    int Field;
+};
+
+
 class ClassWithOverloads
 {
 public:
@@ -33,7 +44,6 @@ class ClassWithSingleInheritance : public Class
 
 class ClassWithExternalInheritance : public ClassFromAnotherUnit
 {
-
 };
 
 void FunctionPassClassByRef(Class* klass) { }

diff --git a/tests/emscripten/test.mjs b/tests/emscripten/test.mjs
@@ -116,6 +116,11 @@ function classes() {
     var classWithField = new test.ClassWithField();
     eq(classWithField.ReturnsField(), 10);
     eq(classWithField.Field, 10);
+
+    var classWithProperty = new test.ClassWithProperty();
+    eq(classWithProperty.Field, 10);
+    classWithProperty.Field = 20;
+    eq(classWithProperty.Field, 20);
 }
 
 

diff --git a/tests/emscripten/test.sh b/tests/emscripten/test.sh
@@ -16,7 +16,7 @@ generate=true
 if [ $generate = true ]; then
     echo "${green}Generating bindings${reset}"
     dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
-        --gen=emscripten --platform=emscripten --arch=wasm32 \
+        --gen=emscripten --platform=emscripten --arch=wasm32 --property=keywords \
         -I$dir/.. -I$rootdir/include -o $dir/gen -m tests $dir/../*.h
 fi