don't allow interface implementations to specify override remove override

2007-03-04  Jürg Billeter  <j@bitron.ch>

	* vala/valasemanticanalyzer.vala: don't allow interface implementations
	  to specify override
	* vala/valaconstant.vala, vala/valafield.vala,
	  vala/valaformalparameter.vala, vala/valamethod.vala,
	  vala/valaproperty.vala, vala/valasignal.vala,
	  vala/valavariabledeclarator.vala: remove override from interface
	  implementations

svn path=/trunk/; revision=219

diff --git a/vala/ChangeLog b/vala/ChangeLog
index b78a766..4438228 100644 (file)
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,5 +1,15 @@
 2007-03-04  Jürg Billeter  <j@bitron.ch>
 
+       * vala/valasemanticanalyzer.vala: don't allow interface implementations
+         to specify override
+       * vala/valaconstant.vala, vala/valafield.vala,
+         vala/valaformalparameter.vala, vala/valamethod.vala,
+         vala/valaproperty.vala, vala/valasignal.vala,
+         vala/valavariabledeclarator.vala: remove override from interface
+         implementations
+
+2007-03-04  Jürg Billeter  <j@bitron.ch>
+
        * vala/parser.y, vala/valainterface.vala,
          vala/valasemanticanalyzer.vala: rename base_types of interfaces to
          prerequisites to follow GObject terminology

diff --git a/vala/vala/valaconstant.vala b/vala/vala/valaconstant.vala
index 88a9b40..a3a845e 100644 (file)
--- a/vala/vala/valaconstant.vala
+++ b/vala/vala/valaconstant.vala
@@ -104,11 +104,11 @@ public class Vala.Constant : Member, Lockable {
                return cname;
        }
        
-       public override bool get_lock_used () {
+       public bool get_lock_used () {
                return lock_used;
        }
        
-       public override void set_lock_used (bool used) {
+       public void set_lock_used (bool used) {
                lock_used = used;
        }
 }

diff --git a/vala/vala/valafield.vala b/vala/vala/valafield.vala
index 50168bf..884de75 100644 (file)
--- a/vala/vala/valafield.vala
+++ b/vala/vala/valafield.vala
@@ -141,7 +141,7 @@ public class Vala.Field : Member, Invokable, Lockable {
                }
        }
 
-       public override ref List<weak FormalParameter> get_parameters () {
+       public ref List<weak FormalParameter> get_parameters () {
                if (!is_invokable ()) {
                        return null;
                }
@@ -150,7 +150,7 @@ public class Vala.Field : Member, Invokable, Lockable {
                return cb.get_parameters ();
        }
        
-       public override TypeReference get_return_type () {
+       public TypeReference get_return_type () {
                if (!is_invokable ()) {
                        return null;
                }
@@ -159,15 +159,15 @@ public class Vala.Field : Member, Invokable, Lockable {
                return cb.return_type;
        }
 
-       public override bool is_invokable () {
+       public bool is_invokable () {
                return (type_reference.data_type is Callback);
        }
        
-       public override bool get_lock_used () {
+       public bool get_lock_used () {
                return lock_used;
        }
        
-       public override void set_lock_used (bool used) {
+       public void set_lock_used (bool used) {
                lock_used = used;
        }
 }

diff --git a/vala/vala/valaformalparameter.vala b/vala/vala/valaformalparameter.vala
index c699a18..4b4d3cf 100644 (file)
--- a/vala/vala/valaformalparameter.vala
+++ b/vala/vala/valaformalparameter.vala
@@ -96,7 +96,7 @@ public class Vala.FormalParameter : CodeNode, Invokable {
                visitor.visit_formal_parameter (this);
        }
 
-       public override ref List<weak FormalParameter> get_parameters () {
+       public ref List<weak FormalParameter> get_parameters () {
                if (!is_invokable ()) {
                        return null;
                }
@@ -105,7 +105,7 @@ public class Vala.FormalParameter : CodeNode, Invokable {
                return cb.get_parameters ();
        }
        
-       public override TypeReference get_return_type () {
+       public TypeReference get_return_type () {
                if (!is_invokable ()) {
                        return null;
                }
@@ -114,7 +114,7 @@ public class Vala.FormalParameter : CodeNode, Invokable {
                return cb.return_type;
        }
 
-       public override bool is_invokable () {
+       public bool is_invokable () {
                return (type_reference.data_type is Callback);
        }
 }

diff --git a/vala/vala/valamethod.vala b/vala/vala/valamethod.vala
index fd20e1e..8569eb7 100644 (file)
--- a/vala/vala/valamethod.vala
+++ b/vala/vala/valamethod.vala
@@ -168,15 +168,15 @@ public class Vala.Method : Member, Invokable {
                parameters.append (param);
        }
        
-       public override ref List<weak FormalParameter> get_parameters () {
+       public ref List<weak FormalParameter> get_parameters () {
                return parameters.copy ();
        }
        
-       public override TypeReference get_return_type () {
+       public TypeReference get_return_type () {
                return return_type;
        }
 
-       public override bool is_invokable () {
+       public bool is_invokable () {
                return true;
        }
        

diff --git a/vala/vala/valaproperty.vala b/vala/vala/valaproperty.vala
index 4d1c759..2b0e48f 100644 (file)
--- a/vala/vala/valaproperty.vala
+++ b/vala/vala/valaproperty.vala
@@ -155,11 +155,11 @@ public class Vala.Property : Member, Lockable {
                }
        }
        
-       public override bool get_lock_used () {
+       public bool get_lock_used () {
                return lock_used;
        }
        
-       public override void set_lock_used (bool used) {
+       public void set_lock_used (bool used) {
                lock_used = used;
        }
 }

diff --git a/vala/vala/valasemanticanalyzer.vala b/vala/vala/valasemanticanalyzer.vala
index 16942f6..240e3cb 100644 (file)
--- a/vala/vala/valasemanticanalyzer.vala
+++ b/vala/vala/valasemanticanalyzer.vala
@@ -238,10 +238,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                                if (m.is_virtual || m.overrides) {
                                        find_base_class_method (m, (Class) current_symbol.node);
                                        if (m.base_method == null) {
-                                               // FIXME remove check after interface override transition
-                                               if (m.base_interface_method == null) {
-                                                       Report.error (m.source_reference, "%s: no suitable method found to override".printf (m.symbol.get_full_name ()));
-                                               }
+                                               Report.error (m.source_reference, "%s: no suitable method found to override".printf (m.symbol.get_full_name ()));
                                        }
                                }
                        }

diff --git a/vala/vala/valasignal.vala b/vala/vala/valasignal.vala
index fc836e0..5e10a2c 100644 (file)
--- a/vala/vala/valasignal.vala
+++ b/vala/vala/valasignal.vala
@@ -77,15 +77,15 @@ public class Vala.Signal : Member, Invokable, Lockable {
                parameters.append (param);
        }
 
-       public override ref List<weak FormalParameter> get_parameters () {
+       public ref List<weak FormalParameter> get_parameters () {
                return parameters.copy ();
        }
        
-       public override TypeReference get_return_type () {
+       public TypeReference get_return_type () {
                return return_type;
        }
 
-       public override bool is_invokable () {
+       public bool is_invokable () {
                return true;
        }
        
@@ -179,11 +179,11 @@ public class Vala.Signal : Member, Invokable, Lockable {
                }
        }
        
-       public override bool get_lock_used () {
+       public bool get_lock_used () {
                return lock_used;
        }
        
-       public override void set_lock_used (bool used) {
+       public void set_lock_used (bool used) {
                lock_used = used;
        }
 }

diff --git a/vala/vala/valavariabledeclarator.vala b/vala/vala/valavariabledeclarator.vala
index a0a134c..321a5b5 100644 (file)
--- a/vala/vala/valavariabledeclarator.vala
+++ b/vala/vala/valavariabledeclarator.vala
@@ -81,7 +81,7 @@ public class Vala.VariableDeclarator : CodeNode, Invokable {
                visitor.visit_variable_declarator (this);
        }
 
-       public override ref List<weak FormalParameter> get_parameters () {
+       public ref List<weak FormalParameter> get_parameters () {
                if (!is_invokable ()) {
                        return null;
                }
@@ -90,7 +90,7 @@ public class Vala.VariableDeclarator : CodeNode, Invokable {
                return cb.get_parameters ();
        }
        
-       public override TypeReference get_return_type () {
+       public TypeReference get_return_type () {
                if (!is_invokable ()) {
                        return null;
                }
@@ -99,7 +99,7 @@ public class Vala.VariableDeclarator : CodeNode, Invokable {
                return cb.return_type;
        }
 
-       public override bool is_invokable () {
+       public bool is_invokable () {
                return (type_reference.data_type is Callback);
        }