Remove the now useless MMConcreteProperty class

[nit.git] / src / syntax / mmbuilder.nit

diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 2032534..56e2ace 100644 (file)
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -151,7 +151,7 @@ redef class MMSrcLocalClass
        end
        # Add a source property
        # Register it to the class and attach it to global property
-       private meth add_src_local_property(v: PropertyBuilderVisitor, prop: MMConcreteProperty)
+       private meth add_src_local_property(v: PropertyBuilderVisitor, prop: MMLocalProperty)
        do
                var pname = prop.name
                # Check double definition in the same class
@@ -179,7 +179,7 @@ redef class MMSrcLocalClass
        end
 end
 
-redef class MMConcreteProperty
+redef class MMLocalProperty
        private meth accept_property_visitor(v: AbsSyntaxVisitor)
        do
        end
@@ -616,7 +616,7 @@ redef class PPropdef
        # * Check redef errors.
        # * Check forbiden attribute definitions.
        # * Check signature conformance.
-       private meth process_and_check(v: PropertyVerifierVisitor, prop: MMConcreteProperty, has_redef: Bool, visibility_level: Int)
+       private meth process_and_check(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)
        do
                if prop.global.intro == prop then
                        do_and_check_intro(v, prop, has_redef, visibility_level)
@@ -626,7 +626,7 @@ redef class PPropdef
        end
 
        # The part of process_and_check when prop is an introduction
-       private meth do_and_check_intro(v: PropertyVerifierVisitor, prop: MMConcreteProperty, has_redef: Bool, visibility_level: Int)
+       private meth do_and_check_intro(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)
        do
                var glob = prop.global
                var gbc = prop.local_class.global
@@ -666,11 +666,10 @@ redef class PPropdef
                end
        end
 
-       private meth inherit_signature(v: PropertyVerifierVisitor, prop: MMConcreteProperty, supers: Array[MMLocalProperty])
+       private meth inherit_signature(v: PropertyVerifierVisitor, prop: MMLocalProperty, supers: Array[MMLocalProperty])
        do
                var s = prop.signature
                for ip in supers do
-                       assert ip isa MMConcreteProperty
                        var isig = ip.signature.adaptation_to(v.local_class.get_type)
 
                        if s == null then
@@ -694,7 +693,7 @@ redef class PPropdef
        end
 
        # The part of process_and_check when prop is a redefinition
-       private meth do_and_check_redef(v: PropertyVerifierVisitor, prop: MMConcreteProperty, has_redef: Bool, visibility_level: Int)
+       private meth do_and_check_redef(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)
        do
                var is_init = self isa AConcreteInitPropdef
                var glob = prop.global
@@ -711,7 +710,7 @@ redef class PPropdef
 
                var s = prop.signature
                #print "process {prop.local_class.module}::{prop.local_class}::{prop} from global {prop.global.local_property.local_class.module}::{prop.global.local_property.local_class}::{prop.global.local_property}"
-               for i in prop.cprhe.direct_greaters do
+               for i in prop.prhe.direct_greaters do
                        var ip = i.local_class[prop.global]
                        var isig = i.signature.adaptation_to(v.local_class.get_type)
 
@@ -962,7 +961,7 @@ end
 
 redef class PSignature
        # Check that visibilities of types in the signature are compatible with the visibility of the property.
-       meth check_visibility(v: AbsSyntaxVisitor, p: MMConcreteProperty) is abstract
+       meth check_visibility(v: AbsSyntaxVisitor, p: MMLocalProperty) is abstract
 end
 
 redef class ASignature
@@ -1042,7 +1041,7 @@ end
 
 redef class PType
        # Check that visibilities of types in the signature are compatible with the visibility of the property.
-       private meth check_visibility(v: AbsSyntaxVisitor, p: MMConcreteProperty) is abstract
+       private meth check_visibility(v: AbsSyntaxVisitor, p: MMLocalProperty) is abstract
 end
 
 redef class AType