X-Git-Url: http://nitlanguage.org diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit index bc8ce32..20fb090 100644 --- a/src/syntax/mmbuilder.nit +++ b/src/syntax/mmbuilder.nit @@ -21,6 +21,23 @@ package mmbuilder import syntax_base +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] @@ -302,7 +319,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 @@ -426,43 +447,38 @@ redef class AModule fun import_super_modules(tc: ToolContext, mod: MMSrcModule) do # Import super-modules - var module_names_to_import = new Array[Symbol] - var module_visibility = new HashMap[Symbol, Int] + var supers = new Array[MMModule] var no_import: nullable AImport = null for i in n_imports do var n = i.module_name if n != null then - module_names_to_import.add(n) - module_visibility[n] = i.visibility_level + var m = tc.get_module(n, mod) + supers.add(m) + mod.add_super_module(m, i.visibility_level) else no_import = i end end if no_import != null then - if not module_names_to_import.is_empty then + if not supers.is_empty then tc.error(no_import.location, "Error: Top modules cannot import other modules.") end - else if module_names_to_import.is_empty then + else if supers.is_empty then var stdname = once "standard".to_symbol - module_names_to_import.add(stdname) - module_visibility[stdname] = 1 + var m = tc.get_module(stdname, mod) + supers.add(m) + mod.add_super_module(m, 1) end - mod.import_supers_modules(module_names_to_import) - - for mname in module_names_to_import do - var level = module_visibility[mname] - var m = tc.get_module(mname, mod) - mod.add_super_module(m, level) - end + tc.add_module(mod, supers) end end redef class AModuledecl redef fun accept_class_builder(v) do - if n_id.to_symbol != v.mmmodule.name then - v.error(n_id, "Error: Module name mismatch between {v.mmmodule.name} and {n_id.to_symbol}") + if n_name.n_id.to_symbol != v.mmmodule.name then + v.error(n_name.n_id, "Error: Module name mismatch between {v.mmmodule.name} and {n_name.n_id.to_symbol}") end end end @@ -477,7 +493,7 @@ end redef class AStdImport redef fun module_name do - return n_id.to_symbol + return n_name.n_id.to_symbol end redef fun visibility_level do @@ -529,6 +545,7 @@ redef class AClassdef var local_classes = mod.src_local_classes if (local_classes.has_key(name)) then local_class = local_classes[name] + _local_class = local_class if self isa AStdClassdef then # If we are not a special implicit class then rant v.error(self, "Error: A class {name} is already defined at line {local_class.node.location.line_start}.") @@ -540,15 +557,16 @@ redef class AClassdef n.next_node = self else local_class = new MMSrcLocalClass(mod, name, self, arity) + _local_class = local_class local_classes[name] = local_class if not mod.has_global_class_named(name) then - local_class.new_global + build_class_introduction(v) else - local_class.set_global(mod.global_class_named(name)) + var glob = mod.global_class_named(name) + build_class_refinement(v, glob) end end - _local_class = local_class v.local_class_arity = 0 v.formals = local_class.formal_dict @@ -559,6 +577,70 @@ redef class AClassdef v.formals = null end + fun build_class_introduction(v: AbsSyntaxVisitor) + do + local_class.new_global + var glob = local_class.global + + glob.visibility_level = visibility_level + if self isa AStdClassdef then + if n_kwredef != null then + v.error(self, "Redef error: No class {name} is imported. Remove the redef keyword to define a new class.") + return + end + glob.is_interface = n_classkind.is_interface + glob.is_abstract = n_classkind.is_abstract + glob.is_enum = n_classkind.is_enum + end + end + + fun build_class_refinement(v: AbsSyntaxVisitor, glob: MMGlobalClass) + do + local_class.set_global(glob) + + glob.check_visibility(v, self, v.mmmodule) + if self isa AStdClassdef and n_kwredef == null then + v.error(self, "Redef error: {name} is an imported class. Add the redef keyword to refine it.") + return + end + + if glob.intro.arity != _local_class.arity then + v.error(self, "Redef error: Formal parameter arity missmatch; got {_local_class.arity}, expected {glob.intro.arity}.") + end + + if self isa AStdClassdef and (not glob.is_interface and n_classkind.is_interface or + not glob.is_abstract and n_classkind.is_abstract or + not glob.is_enum and n_classkind.is_enum) + then + v.error(self, "Redef error: cannot change kind of class {name}.") + end + end + + redef fun accept_class_verifier(v) + do + super + var glob = _local_class.global + for c in _local_class.cshe.direct_greaters do + var cg = c.global + if glob.is_interface then + if cg.is_enum then + v.error(self, "Special error: Interface {name} try to specialise enum class {c.name}.") + else if not cg.is_interface then + v.error(self, "Special error: Interface {name} try to specialise class {c.name}.") + end + else if glob.is_enum then + if not cg.is_interface and not cg.is_enum then + v.error(self, "Special error: Enum class {name} try to specialise class {c.name}.") + end + else + if cg.is_enum then + v.error(self, "Special error: Class {name} try to specialise enum class {c.name}.") + end + end + + end + end + redef fun accept_abs_syntax_visitor(v) do v.local_class = _local_class @@ -845,7 +927,9 @@ redef class APropdef #print "process {prop.local_class.mmmodule}::{prop.local_class}::{prop} from global {prop.global.local_property.local_class.mmmodule}::{prop.global.local_property.local_class}::{prop.global.local_property}" 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) + var isig = i.signature + if isig == null then break # previous signature is invalid + isig = isig.adaptation_to(v.local_class.get_type) if s == null then #print "{prop.full_name} inherits signature from {ip.full_name}" @@ -880,11 +964,22 @@ redef class APropdef if s.arity != isig.arity then v.error(self, "Redef error: {prop.local_class}::{prop} redefines {ip.local_class}::{ip} with {isig.arity} parameter(s).") - else - for j in [0..s.arity[ do - if s[j] != isig[j] then - v.error(self, "Redef error: Expected {isig[j]} (as in {ip.local_class}::{ip}), got {s[j]} in {prop.local_class}::{prop}.") + else if s.arity > 0 then + if self isa AMethPropdef then + # A standard method + for j in [0..s.arity[ do + if s[j] != isig[j] then + v.error(n_signature.n_params[j], "Redef error: Expected {isig[j]}, as in {ip.local_class}::{ip}.") + end + end + else if self isa AAttrPropdef then + # A write accessor + if s[0] != isig[0] then + v.error(n_type, "Redef error: Expected {isig[0]}, as in the parameter of {ip.local_class}::{ip}.") end + + else + abort # end end @@ -895,13 +990,21 @@ redef class APropdef else if srt != null and isrt == null then v.error(self, "Redef error: The function {prop.local_class}::{prop} redefines the procedure {ip.local_class}::{ip}.") else if srt != null and isrt != null and not srt < isrt then - v.error(self, "Redef error: Expected {isrt} (as in {ip.local_class}::{ip}), got {srt} in {prop.local_class}::{prop}.") + var n: nullable ANode = null + if self isa AMethPropdef then + n = self.n_signature.n_type + else if self isa AAttrPropdef then + n = self.n_type + else if self isa ATypePropdef then + n = self.n_type + end + v.error(n, "Redef error: Expected {isrt}, as in {ip.local_class}::{ip}.") else if not s < isig and nberr == v.tc.error_count then # Systematic fallback for conformance check v.error(self, "Redef error: Incompatible redefinition of {ip.local_class}::{ip} with {prop.local_class}::{prop}") else if srt != null and isrt != null and srt != isrt and prop isa MMAttribute then # FIXME: To remove - v.warning(self, "Redef warning: Expected {isrt} (as in {ip.local_class}::{ip}), got {srt} in {prop.local_class}::{prop}.") + v.warning(self, "Redef warning: Expected {isrt}, as in {ip.local_class}::{ip}.") end end