]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Use constructor chaining instead of helper method
authorJürg Billeter <j@bitron.ch>
Mon, 27 Oct 2008 08:12:26 +0000 (08:12 +0000)
committerJürg Billeter <juergbi@src.gnome.org>
Mon, 27 Oct 2008 08:12:26 +0000 (08:12 +0000)
2008-10-27  Jürg Billeter  <j@bitron.ch>

* vala/valaarraylengthfield.vala:
* vala/valaarraymovemethod.vala:
* vala/valaarrayresizemethod.vala:
* vala/valablock.vala:
* vala/valaclass.vala:
* vala/valaconstant.vala:
* vala/valaconstructor.vala:
* vala/valacreationmethod.vala:
* vala/valadelegate.vala:
* vala/valadestructor.vala:
* vala/valadynamicmethod.vala:
* vala/valadynamicproperty.vala:
* vala/valadynamicsignal.vala:
* vala/valaenum.vala:
* vala/valaenumvalue.vala:
* vala/valaerrorcode.vala:
* vala/valaerrordomain.vala:
* vala/valafield.vala:
* vala/valaforeachstatement.vala:
* vala/valaformalparameter.vala:
* vala/valainterface.vala:
* vala/valalocalvariable.vala:
* vala/valamember.vala:
* vala/valamethod.vala:
* vala/valanamespace.vala:
* vala/valaobjecttypesymbol.vala:
* vala/valaproperty.vala:
* vala/valasignal.vala:
* vala/valastruct.vala:
* vala/valaswitchsection.vala:
* vala/valasymbol.vala:
* vala/valatypeparameter.vala:
* vala/valatypesymbol.vala:

Use constructor chaining instead of helper method

svn path=/trunk/; revision=1934

34 files changed:
ChangeLog
vala/valaarraylengthfield.vala
vala/valaarraymovemethod.vala
vala/valaarrayresizemethod.vala
vala/valablock.vala
vala/valaclass.vala
vala/valaconstant.vala
vala/valaconstructor.vala
vala/valacreationmethod.vala
vala/valadelegate.vala
vala/valadestructor.vala
vala/valadynamicmethod.vala
vala/valadynamicproperty.vala
vala/valadynamicsignal.vala
vala/valaenum.vala
vala/valaenumvalue.vala
vala/valaerrorcode.vala
vala/valaerrordomain.vala
vala/valafield.vala
vala/valaforeachstatement.vala
vala/valaformalparameter.vala
vala/valainterface.vala
vala/valalocalvariable.vala
vala/valamember.vala
vala/valamethod.vala
vala/valanamespace.vala
vala/valaobjecttypesymbol.vala
vala/valaproperty.vala
vala/valasignal.vala
vala/valastruct.vala
vala/valaswitchsection.vala
vala/valasymbol.vala
vala/valatypeparameter.vala
vala/valatypesymbol.vala

index bfb17df06cfa8257a88427735f8d8d36bda4a02d..4260e97bdfbeca0ebe9919cdc155137cd19336e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2008-10-27  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valaarraylengthfield.vala:
+       * vala/valaarraymovemethod.vala:
+       * vala/valaarrayresizemethod.vala:
+       * vala/valablock.vala:
+       * vala/valaclass.vala:
+       * vala/valaconstant.vala:
+       * vala/valaconstructor.vala:
+       * vala/valacreationmethod.vala:
+       * vala/valadelegate.vala:
+       * vala/valadestructor.vala:
+       * vala/valadynamicmethod.vala:
+       * vala/valadynamicproperty.vala:
+       * vala/valadynamicsignal.vala:
+       * vala/valaenum.vala:
+       * vala/valaenumvalue.vala:
+       * vala/valaerrorcode.vala:
+       * vala/valaerrordomain.vala:
+       * vala/valafield.vala:
+       * vala/valaforeachstatement.vala:
+       * vala/valaformalparameter.vala:
+       * vala/valainterface.vala:
+       * vala/valalocalvariable.vala:
+       * vala/valamember.vala:
+       * vala/valamethod.vala:
+       * vala/valanamespace.vala:
+       * vala/valaobjecttypesymbol.vala:
+       * vala/valaproperty.vala:
+       * vala/valasignal.vala:
+       * vala/valastruct.vala:
+       * vala/valaswitchsection.vala:
+       * vala/valasymbol.vala:
+       * vala/valatypeparameter.vala:
+       * vala/valatypesymbol.vala:
+
+       Use constructor chaining instead of helper method
+
 2008-10-26  Jürg Billeter  <j@bitron.ch>
 
        * vala/Makefile.am:
index 87a8b52d57adf3eac85f19dfb08a2c9f615e4203..220718000db574a02d18249a3a3a21b2172dbda9 100644 (file)
@@ -32,9 +32,7 @@ public class Vala.ArrayLengthField : Field {
         * @return newly created field
         */
        public ArrayLengthField (SourceReference source_reference) {
-               base.init ();
-               name = "length";
+               base ("length", new InvalidType (), null, source_reference);
                external = true;
-               this.source_reference = source_reference;
        }
 }
index 0f22c041d42370efd0e3ef01e58118aeea024aa1..916ae04f28f9c12af950507cd19242068ee11dac 100644 (file)
@@ -32,9 +32,7 @@ public class Vala.ArrayMoveMethod : Method {
         * @return newly created method
         */
        public ArrayMoveMethod (SourceReference source_reference) {
-               base.init ();
-               name = "move";
+               base ("move", new VoidType (), source_reference);
                external = true;
-               this.source_reference = source_reference;
        }
 }
index f44a5bc0160a629c9e4c4f64e809fc5c9b88c154..ff9bc617325fcde2af09c79410be6974f3bfdc9d 100644 (file)
@@ -32,10 +32,8 @@ public class Vala.ArrayResizeMethod : Method {
         * @return newly created method
         */
        public ArrayResizeMethod (SourceReference source_reference) {
-               base.init ();
-               name = "resize";
+               base ("resize", new VoidType (), source_reference);
                external = true;
-               this.source_reference = source_reference;
                cinstance_parameter_position = 0.1;
        }
 }
index c8d19a8dc1f40d55ad42f0afee4dbd6fb6462194..9de4840644b4003eb651f2958fb5e44eb364b9ae 100644 (file)
@@ -42,8 +42,7 @@ public class Vala.Block : Symbol, Statement {
         * @param source reference to source code
         */
        public Block (SourceReference source_reference) {
-               base.init ();
-               this.source_reference = source_reference;
+               base (null, source_reference);
        }
        
        /**
index 6c261c6af9362da2c2e5bd17393ad1bfdf897f17..8a066d3311daca4c7ed41ddff2d5851bd7fc1281 100644 (file)
@@ -209,9 +209,7 @@ public class Vala.Class : ObjectTypeSymbol {
         * @return       newly created class
         */
        public Class (string name, SourceReference? source_reference = null) {
-               base.init ();
-               this.source_reference = source_reference;
-               this.name = name;
+               base (name, source_reference);
        }
 
        /**
index 8c6987fac685f9eae6f6023aef1e350696911c7e..6d31c57873e900d45c4164f148a711ee216d3967 100644 (file)
@@ -68,11 +68,9 @@ public class Vala.Constant : Member, Lockable {
         * @return                 newly created constant
         */
        public Constant (string name, DataType type_reference, Expression? initializer, SourceReference? source_reference) {
-               base.init ();
-               this.name = name;
+               base (name, source_reference);
                this.type_reference = type_reference;
                this.initializer = initializer;
-               this.source_reference = source_reference;
        }
 
        public override void accept (CodeVisitor visitor) {
index 7ad4a554ff8cd09ef9d290a8e8d569b332832b88..6e0c476c0d49834d7da4174b11406dc163456aac 100644 (file)
@@ -48,8 +48,7 @@ public class Vala.Constructor : Symbol {
         * @return       newly created constructor
         */
        public Constructor (SourceReference source) {
-               base.init ();
-               source_reference = source;
+               base (null, source);
        }
 
        public override void accept (CodeVisitor visitor) {
index 9fcbc72a52e180c86b79703f463c16a230cda6fa..fccca87e8b164c83cfe7aed1c38dacd8eefd17c3 100644 (file)
@@ -59,11 +59,8 @@ public class Vala.CreationMethod : Method {
         * @return                 newly created method
         */
        public CreationMethod (string? type_name, string? name, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
-               this.source_reference = source_reference;
+               base (name, new VoidType (), source_reference);
                this.type_name = type_name;
-               return_type = new VoidType ();
 
                carray_length_parameter_position = -3;
                cdelegate_target_parameter_position = -3;
index fdf949f8a3b6e5c16f1a2ef8702adf5fa00f6065..0ad7ad62a6b0e3966fcb568f88a95e5e1d7e9198 100644 (file)
@@ -95,10 +95,8 @@ public class Vala.Delegate : TypeSymbol {
         * @return            newly created delegate
         */
        public Delegate (string? name, DataType return_type, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
+               base (name, source_reference);
                this.return_type = return_type;
-               this.source_reference = source_reference;
 
                // error is -1 (right of user_data)
                cinstance_parameter_position = -2;
index df623c512c84dec8616456cf0610967e82086f0e..0d0da978ef31c3bc045c1915d83373f736c1117b 100644 (file)
@@ -48,8 +48,7 @@ public class Vala.Destructor : Symbol {
         * @return                 newly created destructor
         */
        public Destructor (SourceReference? source_reference = null) {
-               base.init ();
-               this.source_reference = source_reference;
+               base (null, source_reference);
        }
 
        public override void accept (CodeVisitor visitor) {
index 94ed2e31c43ca88652c03126d90d769a75cad791..848911cbfcd9c108879cb4942a3703fd506d9c81 100644 (file)
@@ -35,11 +35,8 @@ public class Vala.DynamicMethod : Method {
        static int dynamic_method_id;
 
        public DynamicMethod (DataType dynamic_type, string name, DataType return_type, SourceReference? source_reference = null) {
-               base.init ();
+               base (name, return_type, source_reference);
                this.dynamic_type = dynamic_type;
-               this.name = name;
-               this.return_type = return_type;
-               this.source_reference = source_reference;
        }
 
        public override Gee.List<string> get_cheader_filenames () {
index 17c6aae412680a7c15e72e29fc15d185c30f5d91..e18ebbe3c7ff65a4a3f832a572730686e8729657 100644 (file)
@@ -32,10 +32,8 @@ public class Vala.DynamicProperty : Property {
        private string cname;
 
        public DynamicProperty (DataType dynamic_type, string name, SourceReference? source_reference = null) {
-               base.init ();
+               base (name, null, null, null, source_reference);
                this.dynamic_type = dynamic_type;
-               this.name = name;
-               this.source_reference = source_reference;
        }
 
        public override Gee.List<string> get_cheader_filenames () {
index 96e4216aa654e5bf4b6ab1e5efcb2a1976e7858c..a363aa9943a86f5e6580d90bc3405a48d0ef548a 100644 (file)
@@ -31,10 +31,7 @@ public class Vala.DynamicSignal : Signal {
        public Expression handler { get; set; }
 
        public DynamicSignal (DataType dynamic_type, string name, DataType return_type, SourceReference? source_reference = null) {
-               base.init ();
+               base (name, return_type, source_reference);
                this.dynamic_type = dynamic_type;
-               this.name = name;
-               this.return_type = return_type;
-               this.source_reference = source_reference;
        }
 }
index 60a63a3cee003057d7593e45c3ca1799049144c5..132d1eb32b36dbd0c35806958619d059da5a40e6 100644 (file)
@@ -53,9 +53,7 @@ public class Vala.Enum : TypeSymbol {
         * @return                 newly created enum
         */
        public Enum (string name, SourceReference? source_reference = null) {
-               base.init ();
-               this.source_reference = source_reference;
-               this.name = name;
+               base (name, source_reference);
        }
        
        /**
index 53f014bd52dc28aa5117ededd3e5ba78c9a3b7ff..dba9513e65f7852238868c8a8a4e460a6a9ad252 100644 (file)
@@ -40,9 +40,7 @@ public class Vala.EnumValue : Symbol {
         * @return     newly created enum value
         */
        public EnumValue (string name, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
-               this.source_reference = source_reference;
+               base (name, source_reference);
        }
 
        /**
@@ -53,10 +51,8 @@ public class Vala.EnumValue : Symbol {
         * @return      newly created enum value
         */
        public EnumValue.with_value (string name, Expression value, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
+               this (name, source_reference);
                this.value = value;
-               this.source_reference = source_reference;
        }
        
        /**
index dab5526484e2d3a3edbb649362e69dd23c0951ff..aeef7f584f2a1868e4ee4b6db9e9bc59471857a3 100644 (file)
@@ -40,9 +40,7 @@ public class Vala.ErrorCode : TypeSymbol {
         * @return     newly created enum value
         */
        public ErrorCode (string name, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
-               this.source_reference = source_reference;
+               base (name, source_reference);
        }
 
        /**
@@ -53,10 +51,8 @@ public class Vala.ErrorCode : TypeSymbol {
         * @return      newly created enum value
         */
        public ErrorCode.with_value (string name, Expression value, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
+               this (name, source_reference);
                this.value = value;
-               this.source_reference = source_reference;
        }
        
        public override void accept (CodeVisitor visitor) {
index 418f3a3ca6f2f1f816faf2536681363089bd7a8d..d302aed17fb0b76e533f8d465aa77b57320e9538 100644 (file)
@@ -42,9 +42,7 @@ public class Vala.ErrorDomain : TypeSymbol {
         * @return                 newly created error domain
         */
        public ErrorDomain (string name, SourceReference? source_reference = null) {
-               base.init ();
-               this.source_reference = source_reference;
-               this.name = name;
+               base (name, source_reference);
        }
        
        /**
index 7625efa35bee5690ec5b6686ec2a3afc4d562e56..f9b4a954a5a64d8ad30b3e9d6af64cff7da5a5b3 100644 (file)
@@ -87,11 +87,9 @@ public class Vala.Field : Member, Lockable {
         * @return       newly created field
         */
        public Field (string name, DataType field_type, Expression? initializer, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
+               base (name, source_reference);
                this.field_type = field_type;
                this.initializer = initializer;
-               this.source_reference = source_reference;
        }
 
        public override void accept (CodeVisitor visitor) {
index cf3fa611b1570fb3dd4b14ef6100c6bd13af3bb6..5133a286b9e84a15e1575d9a09a5ebbb7d53de9b 100644 (file)
@@ -101,11 +101,10 @@ public class Vala.ForeachStatement : Block {
         * @return       newly created foreach statement
         */
        public ForeachStatement (DataType? type_reference, string variable_name, Expression collection, Block body, SourceReference source_reference) {
-               base.init ();
+               base (source_reference);
                this.variable_name = variable_name;
                this.collection = collection;
                this.body = body;
-               this.source_reference = source_reference;
                this.type_reference = type_reference;
        }
        
index 014a5faed1cec464e506327ae45ea9395bb0fe04..d0693759a497576e22e84875cc78f4dda914af9b 100644 (file)
@@ -98,10 +98,8 @@ public class Vala.FormalParameter : Symbol {
         * @return       newly created formal parameter
         */
        public FormalParameter (string name, DataType parameter_type, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
+               base (name, source_reference);
                this.parameter_type = parameter_type;
-               this.source_reference = source_reference;
 
                access = SymbolAccessibility.PUBLIC;
        }
@@ -110,10 +108,9 @@ public class Vala.FormalParameter : Symbol {
         * Creates a new ellipsis parameter representing an indefinite number of
         * parameters.
         */
-       public FormalParameter.with_ellipsis (SourceReference? source = null) {
-               base.init ();
+       public FormalParameter.with_ellipsis (SourceReference? source_reference = null) {
+               base (null, source_reference);
                ellipsis = true;
-               source_reference = source;
 
                access = SymbolAccessibility.PUBLIC;
        }
index 224dd491956151c3abebd08a9c8fc1ac65bf081e..a925f640b7e34ce278cf656f2d7232ce2bec0aaf 100644 (file)
@@ -97,9 +97,7 @@ public class Vala.Interface : ObjectTypeSymbol {
         * @return       newly created interface
         */
        public Interface (string name, SourceReference? source_reference = null) {
-               base.init ();
-               this.source_reference = source_reference;
-               this.name = name;
+               base (name, source_reference);
        }
 
        /**
index e9a20092010e655a403366c76b60d374a4c5dd90..f8767118b010648d068881f077b60add6d115039 100644 (file)
@@ -66,11 +66,9 @@ public class Vala.LocalVariable : Symbol {
         * @return       newly created variable declarator
         */
        public LocalVariable (DataType? variable_type, string name, Expression? initializer = null, SourceReference? source_reference = null) {
-               base.init ();
+               base (name, source_reference);
                this.variable_type = variable_type;
-               this.name = name;
                this.initializer = initializer;
-               this.source_reference = source_reference;
        }
        
        public override void accept (CodeVisitor visitor) {
index 954bcf5221590fc0e2ef504d4a5de6cc084dd8bd..ceb4ceeb2d19ff23bf5039d5d204932d7057867b 100644 (file)
@@ -28,7 +28,11 @@ using Gee;
  */
 public abstract class Vala.Member : Symbol {
        private Gee.List<string> cheader_filenames = new ArrayList<string> ();
-       
+
+       public Member (string? name, SourceReference? source_reference) {
+               base (name, source_reference);
+       }
+
        public override void accept (CodeVisitor visitor) {
                visitor.visit_member (this);
        }
index 6cebf47448956521cf6c9627a33e5d31599b6551..f18a5b3fd02123c05f29bac0db9c0114fcdfefb4 100644 (file)
@@ -222,11 +222,9 @@ public class Vala.Method : Member {
         * @param source      reference to source code
         * @return            newly created method
         */
-       public Method (string name, DataType return_type, SourceReference? source_reference = null) {
-               base.init ();
+       public Method (string? name, DataType return_type, SourceReference? source_reference = null) {
+               base (name, source_reference);
                this.return_type = return_type;
-               this.source_reference = source_reference;
-               this.name = name;
 
                carray_length_parameter_position = -3;
                cdelegate_target_parameter_position = -3;
index c6245c08d49d43a6e7801a3553ba1ce62be7d079..e83793567ad2cb274bd354ad2173e108db51fde5 100644 (file)
@@ -52,9 +52,7 @@ public class Vala.Namespace : Symbol {
         * @return                 newly created namespace
         */
        public Namespace (string? name, SourceReference? source_reference = null) {
-               base.init ();
-               this.source_reference = source_reference;
-               this.name = name;
+               base (name, source_reference);
                access = SymbolAccessibility.PUBLIC;
        }
        
index 4bc7e329441d82b9b15ef8e53523401d29c0e851..069d184931438f92c4188fc9a4e4c6f846f6006b 100644 (file)
@@ -32,4 +32,8 @@ public abstract class Vala.ObjectTypeSymbol : TypeSymbol {
        public abstract Gee.List<Method> get_methods ();
        public abstract Gee.List<Signal> get_signals ();
        public abstract Gee.List<Property> get_properties ();
+
+       public ObjectTypeSymbol (string name, SourceReference? source_reference = null) {
+               base (name, source_reference);
+       }
 }
index 2afe27b4a8437c74f7658138ac06f8ce9bd81f68..fee4bd3ddc074e8d08ad337f82c8f1b4a5a7102f 100644 (file)
@@ -30,7 +30,7 @@ public class Vala.Property : Member, Lockable {
        /**
         * The property type.
         */
-       public DataType property_type {
+       public DataType? property_type {
                get { return _data_type; }
                set {
                        _data_type = value;
@@ -175,13 +175,11 @@ public class Vala.Property : Member, Lockable {
         * @param source       reference to source code
         * @return             newly created property
         */
-       public Property (string name, DataType property_type, PropertyAccessor? get_accessor, PropertyAccessor? set_accessor, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
+       public Property (string name, DataType? property_type, PropertyAccessor? get_accessor, PropertyAccessor? set_accessor, SourceReference? source_reference = null) {
+               base (name, source_reference);
                this.property_type = property_type;
                this.get_accessor = get_accessor;
                this.set_accessor = set_accessor;
-               this.source_reference = source_reference;
        }
 
        public override void accept (CodeVisitor visitor) {
index 6fe63e41ed2e75529fbdbb1fb9004d91c348072d..bb0a40894247bfd1e186a3515879b9c743cae9aa 100644 (file)
@@ -66,10 +66,8 @@ public class Vala.Signal : Member, Lockable {
         * @return            newly created signal
         */
        public Signal (string name, DataType return_type, SourceReference? source_reference = null) {
-               base.init ();
-               this.name = name;
+               base (name, source_reference);
                this.return_type = return_type;
-               this.source_reference = source_reference;
        }
        
        /**
index 9e3850591ce1b2774e1cec4d49791ddaf49a2264..8ec827feb645cdb5869dd73fa19f9e316a9fecfd 100644 (file)
@@ -66,9 +66,7 @@ public class Vala.Struct : TypeSymbol {
         * @return                 newly created struct
         */
        public Struct (string name, SourceReference? source_reference = null) {
-               base.init ();
-               this.source_reference = source_reference;
-               this.name = name;
+               base (name, source_reference);
        }
 
        /**
index 958ecfff343d5756982123363620610611162625..2212c47b964ffe046e9f464179a0fb49ed7efaed 100644 (file)
@@ -36,8 +36,7 @@ public class Vala.SwitchSection : Block {
         * @return                 newly created switch section
         */
        public SwitchSection (SourceReference source_reference) {
-               base.init ();
-               this.source_reference = source_reference;
+               base (source_reference);
        }
        
        /**
index e3e95cfdc93ad222124fdc34852cda0dbee72999..b9ccd7e94ee3f1557b0ce3002c576c3662dceb90 100644 (file)
@@ -56,7 +56,7 @@ public abstract class Vala.Symbol : CodeNode {
        /**
         * The symbol name.
         */
-       public string name { get; set; }
+       public string? name { get; set; }
 
        /**
         * Specifies whether this symbol is active.
@@ -118,7 +118,9 @@ public abstract class Vala.Symbol : CodeNode {
        private weak Scope _owner;
        private Scope _scope;
 
-       public void init () {
+       public Symbol (string? name, SourceReference? source_reference) {
+               this.name = name;
+               this.source_reference = source_reference;
                _scope = new Scope (this);
        }
        
index f25b10bf447afe86a49de8f242831762f988661f..8985ea8a26e6490a845e7301ad66310f0dea0d85 100644 (file)
@@ -39,10 +39,8 @@ public class Vala.TypeParameter : Symbol {
         * @param source reference to source code
         * @return       newly created generic type parameter
         */     
-       public TypeParameter (string _name, SourceReference source) {
-               base.init ();
-               name = _name;
-               source_reference = source;
+       public TypeParameter (string name, SourceReference source_reference) {
+               base (name, source_reference);
        }
 
        public override void accept (CodeVisitor visitor) {
index a838017f70bf36d7b88bceeed358069cc5e98a7d..ccb3820a2d390b190f7c2882971da8d0bc8c1e66 100644 (file)
@@ -31,6 +31,10 @@ using Gee;
 public abstract class Vala.TypeSymbol : Symbol {
        private Gee.List<string> cheader_filenames = new ArrayList<string> ();
 
+       public TypeSymbol (string? name, SourceReference? source_reference = null) {
+               base (name, source_reference);
+       }
+
        /**
         * Returns the name of this data type as it is used in C code.
         *