From: Florian Brosch Date: Sat, 30 Aug 2014 20:34:56 +0000 (+0200) Subject: drivers: Mark arrays as unowned instead of weak X-Git-Tag: 0.37.1~3^2~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2eb894a54313baf027c54a77a7c5c679162f37;p=thirdparty%2Fvala.git drivers: Mark arrays as unowned instead of weak --- diff --git a/src/driver/0.16.x/treebuilder.vala b/src/driver/0.16.x/treebuilder.vala index 5e342a20b..d605bec22 100644 --- a/src/driver/0.16.x/treebuilder.vala +++ b/src/driver/0.16.x/treebuilder.vala @@ -658,6 +658,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { return false; } + // arrays are unowned, not weak + if (element is Vala.ArrayType) { + return false; + } + // FormalParameters are weak by default return (element.parent_node is Vala.Parameter == false)? element.is_weak () : false; } diff --git a/src/driver/0.18.x/treebuilder.vala b/src/driver/0.18.x/treebuilder.vala index 81b5d34aa..3051b8450 100644 --- a/src/driver/0.18.x/treebuilder.vala +++ b/src/driver/0.18.x/treebuilder.vala @@ -659,6 +659,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { return false; } + // arrays are unowned, not weak + if (element is Vala.ArrayType) { + return false; + } + // FormalParameters are weak by default return (element.parent_node is Vala.Parameter == false)? element.is_weak () : false; } diff --git a/src/driver/0.20.x/treebuilder.vala b/src/driver/0.20.x/treebuilder.vala index a85550515..59df9b6d3 100644 --- a/src/driver/0.20.x/treebuilder.vala +++ b/src/driver/0.20.x/treebuilder.vala @@ -666,6 +666,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { return false; } + // arrays are unowned, not weak + if (element is Vala.ArrayType) { + return false; + } + // FormalParameters are weak by default return (element.parent_node is Vala.Parameter == false)? element.is_weak () : false; } diff --git a/src/driver/0.22.x/treebuilder.vala b/src/driver/0.22.x/treebuilder.vala index 03cfe05c0..bb4ef567c 100644 --- a/src/driver/0.22.x/treebuilder.vala +++ b/src/driver/0.22.x/treebuilder.vala @@ -666,6 +666,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { return false; } + // arrays are unowned, not weak + if (element is Vala.ArrayType) { + return false; + } + // FormalParameters are weak by default return (element.parent_node is Vala.Parameter == false)? element.is_weak () : false; } diff --git a/src/driver/0.24.x/treebuilder.vala b/src/driver/0.24.x/treebuilder.vala index 76e52c0cd..591109795 100644 --- a/src/driver/0.24.x/treebuilder.vala +++ b/src/driver/0.24.x/treebuilder.vala @@ -666,6 +666,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { return false; } + // arrays are unowned, not weak + if (element is Vala.ArrayType) { + return false; + } + // FormalParameters are weak by default return (element.parent_node is Vala.Parameter == false)? element.is_weak () : false; } diff --git a/src/driver/0.26.x/treebuilder.vala b/src/driver/0.26.x/treebuilder.vala index f37b1532c..53440a180 100644 --- a/src/driver/0.26.x/treebuilder.vala +++ b/src/driver/0.26.x/treebuilder.vala @@ -159,7 +159,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { Vala.DataType vntype = vtyperef.element_type; if (vntype is Vala.ArrayType) { - arr.data_type = create_array ((Vala.ArrayType) vntype, arr, caller); + arr.data_type = create_type_reference (vntype, arr, caller); } else { arr.data_type = create_type_reference (vntype, arr, caller); } @@ -666,6 +666,11 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor { return false; } + // arrays are unowned, not weak + if (element is Vala.ArrayType) { + return false; + } + // FormalParameters are weak by default return (element.parent_node is Vala.Parameter == false)? element.is_weak () : false; }