← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vala/maverick

« back to all changes in this revision

Viewing changes to vala/valafield.vala

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2010-02-13 17:59:22 UTC
  • mfrom: (7.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100213175922-n8bq2xv2q1hihhqb
Tags: 0.7.10-1ubuntu1
* Sync with Debian unstable.
* Remaining changes :
 - debian/rules: Don't make unit test failures fatal to fix FTBFS. It was
   needed if vala need to enter main but it's not the case for now. 
   (See #374151)

Show diffs side-by-side

added added

removed removed

Lines of Context:
vala/valafield.vala
311
311
                if (initializer != null) {
312
312
                        initializer.target_type = field_type;
313
313
 
314
 
                        initializer.check (analyzer);
 
314
                        if (!initializer.check (analyzer)) {
 
315
                                error = true;
 
316
                                return false;
 
317
                        }
315
318
 
316
319
                        if (!initializer.value_type.compatible (field_type)) {
317
320
                                error = true;