← Back to branch summary

~ubuntu-branches/ubuntu/vivid/vala/vivid

« back to all changes in this revision

Viewing changes to vala/valadelegate.vala

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-07-28 07:58:01 UTC
  • mfrom: (1.5.5 upstream) (7.3.14 experimental)
  • Revision ID: james.westby@ubuntu.com-20100728075801-18u9cg5hv5oety6m
Tags: 0.9.4-1
New upstream development release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
vala/valadelegate.vala
171
171
 
172
172
                        // method is allowed to accept arguments of looser types (weaker precondition)
173
173
                        var method_param = method_params_it.get ();
174
 
                        if (!sender_type.stricter (method_param.parameter_type)) {
 
174
                        if (!sender_type.stricter (method_param.variable_type)) {
175
175
                                return false;
176
176
                        }
177
177
                }
194
194
 
195
195
                        // method is allowed to accept arguments of looser types (weaker precondition)
196
196
                        var method_param = method_params_it.get ();
197
 
                        if (!param.parameter_type.get_actual_type (dt, null, this).stricter (method_param.parameter_type)) {
 
197
                        if (!param.variable_type.get_actual_type (dt, null, this).stricter (method_param.variable_type)) {
198
198
                                return false;
199
199
                        }
200
200
                }
355
355
                        }
356
356
 
357
357
                        if (param.direction == ParameterDirection.IN) {
358
 
                                if (param.parameter_type.value_owned) {
 
358
                                if (param.variable_type.value_owned) {
359
359
                                        str += "owned ";
360
360
                                }
361
361
                        } else {
364
364
                                } else if (param.direction == ParameterDirection.OUT) {
365
365
                                        str += "out ";
366
366
                                }
367
 
                                if (!param.parameter_type.value_owned && param.parameter_type is ReferenceType) {
 
367
                                if (!param.variable_type.value_owned && param.variable_type is ReferenceType) {
368
368
                                        str += "weak ";
369
369
                                }
370
370
                        }
371
371
 
372
 
                        str += param.parameter_type.to_string ();
 
372
                        str += param.variable_type.to_string ();
373
373
 
374
374
                        i++;
375
375
                }