Merge remote branch 'alexis/wip'

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

diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 6c8fef0..61b80a3 100644 (file)
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -22,6 +22,23 @@ package mmbuilder
 import syntax_base
 private import primitive_info
 
+redef class ToolContext
+       redef fun handle_property_conflict(lc, impls)
+       do
+               var location: nullable Location = null
+               if lc isa MMSrcLocalClass then
+                       var node = lc.node
+                       if node != null then node.location
+               end
+               #if location == null then location = lc.mmmodule.location
+               var clas = new Array[MMLocalClass]
+               for i in impls do
+                       clas.add(i.local_class)
+               end
+               self.fatal_error(location, "Property inheritance conflict in class {lc} for `{impls.first.name}': conflicting properties are defined in {clas.join(", ")}")
+       end
+end
+
 # Class specialization hierarchy sorter
 private class CSHSorter
        super AbstractSorter[MMLocalClass]
@@ -164,7 +181,7 @@ redef class MMSrcLocalClass
                        n = n.next_node
                end
 
-               for p in src_local_properties do
+               for p in src_local_properties.values do
                        p.accept_property_visitor(v)
                end
        end
@@ -198,7 +215,7 @@ redef class MMSrcLocalClass
 
                # Collect unassigned attributes
                var unassigned_attributes = new Array[MMSrcAttribute]
-               for a in src_local_properties do
+               for a in src_local_properties.values do
                        if a isa MMSrcAttribute then
                                var n = a.node
                                if n.n_expr == null then unassigned_attributes.add(a)
@@ -303,7 +320,11 @@ redef class MMImplicitInit
                for a in unassigned_attributes do
                        var sig = a.signature
                        if sig == null then return # Broken attribute definition
-                       params.add( new MMParam( sig.return_type.as(not null), once "recv".to_symbol))
+                       var name = a.name
+                       if name.to_s.first == '_' or name.to_s.first == '@' then
+                               name = a.to_s.substring_from(1).to_symbol
+                       end
+                       params.add(new MMParam(sig.return_type.as(not null), name))
                end
                signature = new MMSignature(params, null, local_class.get_type)
        end
@@ -523,7 +544,7 @@ redef class AClassdef
                var local_class: MMSrcLocalClass
                var mod = v.mmmodule
                var local_classes = mod.src_local_classes
-               if (local_classes.has_key(name)) then
+               if local_classes.has_key(name) then
                        local_class = local_classes[name]
                        _local_class = local_class
                        if self isa AStdClassdef then
@@ -955,6 +976,8 @@ redef class APropdef
                                                t = v.type_array(t)
                                        end
                                        p.variable.stype = t
+
+                                       isig.params[p.position].name = p.variable.name
                                end
                                s = isig
                                prop.signature = s
@@ -1067,11 +1090,15 @@ redef class AAttrPropdef
        redef fun accept_property_verifier(v)
        do
                super
-               var t: MMType
+               var t: nullable MMType = null
                if n_type != null then
                        var t0 = n_type.get_stype(v)
                        if t0 != null then t = t0 else return
-               else
+               else if n_expr != null then
+                       t = n_expr.get_easy_stype(v)
+               end
+
+               if t == null then
                        v.error(self, "Not yet implemented: Attribute definition {prop.local_class}::{prop} requires an explicit type.")
                        return
                end
@@ -1085,7 +1112,7 @@ redef class AAttrPropdef
                        var m = _readmethod.as(not null)
                        m.signature = signature
                        process_and_check(v, m, (n_readable != null and n_readable.n_kwredef != null) or (n_id == null and n_kwredef != null), visibility_level)
-                       n_type.check_visibility(v, m)
+                       if n_type != null then n_type.check_visibility(v, m)
                end
                if n_writable != null or n_id == null then
                        var m = _writemethod.as(not null)
@@ -1095,7 +1122,7 @@ redef class AAttrPropdef
                                if n_writable == null then vl = 3 else vl = n_writable.n_visibility.level # write accessor has a specific visibility
                        end
                        process_and_check(v, m, n_writable != null and n_writable.n_kwredef != null, vl)
-                       n_type.check_visibility(v, m)
+                       if n_type != null then n_type.check_visibility(v, m)
                end
        end
 
@@ -1397,4 +1424,30 @@ redef class AExpr
        redef fun accept_class_builder(v) do end
        redef fun accept_property_builder(v) do end
        redef fun accept_property_verifier(v) do end
+
+       private fun get_easy_stype(v:PropertyVerifierVisitor) : nullable MMType do return null
+end
+
+redef class ABoolExpr
+       redef fun get_easy_stype(v) do return v.type_bool
+end
+
+redef class AStringExpr
+       redef fun get_easy_stype(v) do return v.type_string
+end
+
+redef class ACharExpr
+       redef fun get_easy_stype(v) do return v.type_char
+end
+
+redef class AIntExpr
+       redef fun get_easy_stype(v) do return v.type_int
+end
+
+redef class AFloatExpr
+       redef fun get_easy_stype(v) do return v.type_float
+end
+
+redef class ANewExpr
+       redef fun get_easy_stype(v) do return n_type.get_stype(v)
 end