]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Revert "vala: Set default_construction_method in semantic-analyzer check if required"
authorRico Tzschichholz <ricotz@ubuntu.com>
Thu, 23 Apr 2020 05:44:21 +0000 (07:44 +0200)
committerRico Tzschichholz <ricotz@ubuntu.com>
Thu, 23 Apr 2020 06:00:41 +0000 (08:00 +0200)
This reverts commit d176f179581fac880f5598bb53b3475392af2c4b.

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

vala/valaclass.vala
vala/valaparser.vala

index 823106209f9206b5132c38581f042fa4cff66192..5824ef82257607b36948da5b4c19bcd87452c68b 100644 (file)
@@ -543,15 +543,6 @@ public class Vala.Class : ObjectTypeSymbol {
 
                checked = true;
 
-               // ensure there is always a default construction method
-               if (default_construction_method == null
-                   && source_reference.file.file_type == SourceFileType.SOURCE) {
-                       var m = new CreationMethod (name, null, source_reference);
-                       m.access = (is_abstract ? SymbolAccessibility.PROTECTED : SymbolAccessibility.PUBLIC);
-                       m.body = new Block (source_reference);
-                       add_method (m);
-               }
-
                var old_source_file = context.analyzer.current_source_file;
                var old_symbol = context.analyzer.current_symbol;
 
index fe924ce3193f3afa3d10fa28d8038196cbf4ccf2..1750cc7cbaf39c099eca49cd00705531861949d1 100644 (file)
@@ -2616,6 +2616,15 @@ public class Vala.Parser : CodeVisitor {
 
                parse_declarations (cl);
 
+               // ensure there is always a default construction method
+               if (scanner.source_file.file_type == SourceFileType.SOURCE
+                   && cl.default_construction_method == null) {
+                       var m = new CreationMethod (cl.name, null, cl.source_reference);
+                       m.access = (cl.is_abstract ? SymbolAccessibility.PROTECTED : SymbolAccessibility.PUBLIC);
+                       m.body = new Block (cl.source_reference);
+                       cl.add_method (m);
+               }
+
                Symbol result = cl;
                while (sym != null) {
                        sym = sym.inner;