girwriter: Internal fields/vfuncs in type-symbols are public in C

Fixes https://gitlab.gnome.org/GNOME/vala/issues/513

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index 03b0643145a2355716415b070b5f97a95d505f79..ff4600cb713d1f7484029d6c20f204380ed62497 100644 (file)
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -1754,6 +1754,17 @@ public class Vala.GIRWriter : CodeVisitor {
                        return true;
                }
 
+               // internal fields and function pointers in classes/interfaces are public API
+               if (sym.access == SymbolAccessibility.INTERNAL) {
+                       unowned Symbol? parent = sym.parent_symbol;
+                       if (parent != null
+                           && (parent is Class || parent is Interface)
+                           && ((sym is Field && ((Field) sym).binding == MemberBinding.INSTANCE)
+                           || (sym is Method && ((Method) sym).binding == MemberBinding.INSTANCE && (((Method) sym).is_abstract || ((Method) sym).is_virtual)))) {
+                               return true;
+                       }
+               }
+
                return false;
        }
 

diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index 6977d77e824bf35d22791ca9e1f72016d0d8def1..d7521ddcc2f3937c9bb0ae56b2ea087af3635793 100644 (file)
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -114,6 +114,9 @@
                <field name="field">
                        <type name="gint" c:type="gint"/>
                </field>
+               <field name="internal_field">
+                       <type name="gint" c:type="gint"/>
+               </field>
                <field name="fixed_array_field">
                        <array fixed-size="23" c:type="gint*">
                                <type name="gint" c:type="gint"/>
@@ -248,6 +251,26 @@
                                </parameter>
                        </parameters>
                </virtual-method>
+               <method name="internal_method_with_default_impl" c:identifier="gir_test_object_test_internal_method_with_default_impl">
+                       <return-value transfer-ownership="full">
+                               <type name="none" c:type="void"/>
+                       </return-value>
+                       <parameters>
+                               <parameter name="param" transfer-ownership="none">
+                                       <type name="gint8" c:type="gint8"/>
+                               </parameter>
+                       </parameters>
+               </method>
+               <virtual-method name="internal_method_with_default_impl" invoker="internal_method_with_default_impl">
+                       <return-value transfer-ownership="full">
+                               <type name="none" c:type="void"/>
+                       </return-value>
+                       <parameters>
+                               <parameter name="param" transfer-ownership="none">
+                                       <type name="gint8" c:type="gint8"/>
+                               </parameter>
+                       </parameters>
+               </virtual-method>
                <method name="int8_in" c:identifier="gir_test_object_test_int8_in">
                        <return-value transfer-ownership="full">
                                <type name="none" c:type="void"/>
@@ -773,6 +796,21 @@
                                </parameters>
                        </callback>
                </field>
+               <field name="internal_method_with_default_impl">
+                       <callback name="internal_method_with_default_impl" c:type="internal_method_with_default_impl">
+                               <return-value transfer-ownership="full">
+                                       <type name="none" c:type="void"/>
+                               </return-value>
+                               <parameters>
+                                       <parameter name="self" transfer-ownership="none">
+                                               <type name="GirTest.ObjectTest" c:type="GirTestObjectTest*"/>
+                                       </parameter>
+                                       <parameter name="param" transfer-ownership="none">
+                                               <type name="gint8" c:type="gint8"/>
+                                       </parameter>
+                               </parameters>
+                       </callback>
+               </field>
                <field name="coroutine_virtual_async">
                        <callback name="coroutine_virtual_async" c:type="coroutine_virtual_async">
                                <return-value transfer-ownership="none">
@@ -1026,6 +1064,26 @@
                                </parameter>
                        </parameters>
                </virtual-method>
+               <method name="internal_method" c:identifier="gir_test_abstract_object_test_internal_method">
+                       <return-value transfer-ownership="full">
+                               <type name="none" c:type="void"/>
+                       </return-value>
+                       <parameters>
+                               <parameter name="param" transfer-ownership="none">
+                                       <type name="gint8" c:type="gint8"/>
+                               </parameter>
+                       </parameters>
+               </method>
+               <virtual-method name="internal_method" invoker="internal_method">
+                       <return-value transfer-ownership="full">
+                               <type name="none" c:type="void"/>
+                       </return-value>
+                       <parameters>
+                               <parameter name="param" transfer-ownership="none">
+                                       <type name="gint8" c:type="gint8"/>
+                               </parameter>
+                       </parameters>
+               </virtual-method>
        </class>
        <record name="AbstractObjectTestClass" c:type="GirTestAbstractObjectTestClass" glib:is-gtype-struct-for="AbstractObjectTest">
                <field name="parent_class" readable="0" private="1">
@@ -1142,6 +1200,21 @@
                                </parameters>
                        </callback>
                </field>
+               <field name="internal_method">
+                       <callback name="internal_method" c:type="internal_method">
+                               <return-value transfer-ownership="full">
+                                       <type name="none" c:type="void"/>
+                               </return-value>
+                               <parameters>
+                                       <parameter name="self" transfer-ownership="none">
+                                               <type name="GirTest.AbstractObjectTest" c:type="GirTestAbstractObjectTest*"/>
+                                       </parameter>
+                                       <parameter name="param" transfer-ownership="none">
+                                               <type name="gint8" c:type="gint8"/>
+                                       </parameter>
+                               </parameters>
+                       </callback>
+               </field>
        </record>
        <record name="AbstractObjectTestPrivate" c:type="GirTestAbstractObjectTestPrivate" disguised="1"/>
        <class name="ImplementionTest" c:type="GirTestImplementionTest" c:symbol-prefix="implemention_test" glib:type-name="GirTestImplementionTest" glib:get-type="gir_test_implemention_test_get_type" glib:type-struct="ImplementionTestClass" parent="GObject.Object">
@@ -1552,6 +1625,16 @@
                                </parameter>
                        </parameters>
                </virtual-method>
+               <method name="internal_method" c:identifier="gir_test_interface_test_internal_method">
+                       <return-value transfer-ownership="full">
+                               <type name="none" c:type="void"/>
+                       </return-value>
+               </method>
+               <virtual-method name="internal_method" invoker="internal_method">
+                       <return-value transfer-ownership="full">
+                               <type name="none" c:type="void"/>
+                       </return-value>
+               </virtual-method>
                <property name="property" writable="1" construct="1">
                        <type name="gint" c:type="gint"/>
                </property>
@@ -1692,6 +1775,18 @@
                                </parameters>
                        </callback>
                </field>
+               <field name="internal_method">
+                       <callback name="internal_method" c:type="internal_method">
+                               <return-value transfer-ownership="full">
+                                       <type name="none" c:type="void"/>
+                               </return-value>
+                               <parameters>
+                                       <parameter name="self" transfer-ownership="none">
+                                               <type name="GirTest.InterfaceTest" c:type="GirTestInterfaceTest*"/>
+                                       </parameter>
+                               </parameters>
+                       </callback>
+               </field>
                <field name="get_property">
                        <callback name="get_property" c:type="get_property">
                                <return-value transfer-ownership="none">
@@ -1719,6 +1814,33 @@
                                </parameters>
                        </callback>
                </field>
+               <field name="get_internal_property">
+                       <callback name="get_internal_property" c:type="get_internal_property">
+                               <return-value transfer-ownership="none">
+                                       <type name="utf8" c:type="const gchar*"/>
+                               </return-value>
+                               <parameters>
+                                       <parameter name="self" transfer-ownership="none">
+                                               <type name="GirTest.InterfaceTest" c:type="GirTestInterfaceTest*"/>
+                                       </parameter>
+                               </parameters>
+                       </callback>
+               </field>
+               <field name="set_internal_property">
+                       <callback name="set_internal_property" c:type="set_internal_property">
+                               <return-value transfer-ownership="none">
+                                       <type name="none" c:type="void"/>
+                               </return-value>
+                               <parameters>
+                                       <parameter name="self" transfer-ownership="none">
+                                               <type name="GirTest.InterfaceTest" c:type="GirTestInterfaceTest*"/>
+                                       </parameter>
+                                       <parameter name="value" transfer-ownership="none">
+                                               <type name="utf8" c:type="const gchar*"/>
+                                       </parameter>
+                               </parameters>
+                       </callback>
+               </field>
        </record>
        <interface name="SkippedInterface" c:type="GirTestSkippedInterface" c:symbol-prefix="skipped_interface" glib:type-name="GirTestSkippedInterface" glib:get-type="gir_test_skipped_interface_get_type" glib:type-struct="SkippedInterfaceIface" introspectable="0">
        </interface>
@@ -1739,6 +1861,9 @@
                <field name="field_name">
                        <type name="gint" c:type="gint"/>
                </field>
+               <field name="internal_field_name">
+                       <type name="gint" c:type="gint"/>
+               </field>
                <function name="init" c:identifier="gir_test_boxed_struct_init">
                        <return-value transfer-ownership="none">
                                <type name="none" c:type="void"/>
@@ -1759,6 +1884,9 @@
                <field name="field_name">
                        <type name="gint" c:type="gint"/>
                </field>
+               <field name="internal_field_name">
+                       <type name="gint" c:type="gint"/>
+               </field>
                <function name="init" c:identifier="gir_test_struct_init">
                        <return-value transfer-ownership="none">
                                <type name="none" c:type="void"/>

diff --git a/tests/girwriter/girtest.vala b/tests/girwriter/girtest.vala
index 9aeeacc4ad5b29fc2a15d569f3e74473fd317fc7..cd284b5c613ce333e3cbd2d43fb780467d19bfa8 100644 (file)
--- a/tests/girwriter/girtest.vala
+++ b/tests/girwriter/girtest.vala
@@ -2,6 +2,7 @@
 namespace GirTest {
        public struct BoxedStruct {
                public int field_name;
+               internal int internal_field_name;
 
                public BoxedStruct () {
                }
@@ -13,6 +14,7 @@ namespace GirTest {
        [CCode (has_type_id = false)]
        public struct Struct {
                public int field_name;
+               internal int internal_field_name;
 
                public Struct () {
                }
@@ -67,6 +69,7 @@ namespace GirTest {
 
        public interface InterfaceTest : Object {
                public abstract int property { get; construct set; }
+               internal abstract string internal_property { get; set; }
                public virtual void int8_in (int8 param) {
                }
                public virtual async void coroutine_async () {
@@ -76,6 +79,8 @@ namespace GirTest {
                [GIR (visible = false)]
                public virtual async void skipped_coroutine_method (int param) {
                }
+               internal virtual void internal_method () {
+               }
        }
 
        [GIR (visible = false)]
@@ -103,6 +108,8 @@ namespace GirTest {
        public class ObjectTest : Object {
                private static ObjectTest global_instance = new ObjectTest ();
 
+               internal static int internal_global_field = 4711;
+
                public signal void some_signal (int param);
 
                [GIR (visible = false)]
@@ -110,6 +117,8 @@ namespace GirTest {
 
                public int field = 42;
 
+               internal int internal_field = 23;
+
                public int fixed_array_field[23];
 
                public string? nullable_field;
@@ -120,6 +129,8 @@ namespace GirTest {
 
                public string construct_only_property { construct; }
 
+               internal string internal_property { get; set; }
+
                [GIR (visible = false)]
                public string skipped_property { get; construct set; }
 
@@ -164,6 +175,9 @@ namespace GirTest {
                public virtual void method_with_default_impl (int8 param) {
                }
 
+               internal virtual void internal_method_with_default_impl (int8 param) {
+               }
+
                public void int8_in (int8 param) {
                }
 
@@ -281,6 +295,8 @@ namespace GirTest {
 
                [GIR (visible = false)]
                public abstract async void skipped_coroutine_method (int param);
+
+               internal abstract void internal_method (int8 param);
        }
 
        public interface PrerequisiteTest : InterfaceTest {
@@ -288,6 +304,7 @@ namespace GirTest {
 
        public class ImplementionTest : Object, InterfaceTest {
                public int property { get; construct set; }
+               internal string internal_property { get; set; }
        }
 
        [Compact]

diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected
index 23ca2a8bd67b57d7a62197d011eafa38cce9d785..da076711d7327757e2c3736fc3abe3773a1d4c9e 100644 (file)
--- a/tests/girwriter/girtest.vapi-expected
+++ b/tests/girwriter/girtest.vapi-expected
@@ -129,6 +129,7 @@ namespace GirTest {
        [CCode (cheader_filename = "girtest.h")]
        public struct BoxedStruct {
                public int field_name;
+               public int internal_field_name;
                public BoxedStruct ();
                public void inv ();
        }
@@ -140,6 +141,7 @@ namespace GirTest {
        [CCode (cheader_filename = "girtest.h", has_type_id = false)]
        public struct Struct {
                public int field_name;
+               public int internal_field_name;
                public Struct ();
                public void inv ();
        }