X-Git-Url: http://nitlanguage.org diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit index faddda5..2651efe 100644 --- a/src/syntax/mmbuilder.nit +++ b/src/syntax/mmbuilder.nit @@ -23,7 +23,7 @@ import syntax_base # Class specialization hierarchy sorter private class CSHSorter -special AbstractSorter[MMLocalClass] + super AbstractSorter[MMLocalClass] redef fun compare(a, b) do return a.cshe.rank <=> b.cshe.rank @@ -97,7 +97,7 @@ redef class MMSrcModule c.accept_class_visitor(mmbv2) # Default and inherited constructor if needed - if c isa MMSrcLocalClass and c.global.intro == c and not c.global.is_universal and not c.global.is_interface then + if c isa MMSrcLocalClass and c.global.intro == c and not c.global.is_enum and not c.global.is_interface then c.process_default_constructors(mmbv2) end @@ -183,7 +183,7 @@ redef class MMSrcLocalClass var super_inits = new ArraySet[MMLocalProperty] var super_constructors = new ArraySet[MMGlobalProperty] for sc in che.direct_greaters do - if sc.global.is_universal or sc.global.is_interface then continue + if sc.global.is_enum or sc.global.is_interface then continue for gp in sc.global_properties do if not gp.is_init then continue super_constructors.add(gp) @@ -311,7 +311,7 @@ end # Concrete NIT class specialization relation class MMSrcAncestor -special MMAncestor + super MMAncestor redef readable var _local_class: MMLocalClass init(c: MMLocalClass) @@ -326,7 +326,7 @@ end # * Build the classes and attach them to global classes # * Collect generic formal parameters. private class ClassBuilderVisitor -special AbsSyntaxVisitor + super AbsSyntaxVisitor # Current class arity readable writable var _local_class_arity: Int = 0 @@ -340,7 +340,7 @@ end # Another pass visitor for syntax analysis. # * Build ancertors (with only class informations not the type one) private class ClassSpecializationBuilderVisitor -special AbsSyntaxVisitor + super AbsSyntaxVisitor redef fun visit(n) do n.accept_class_specialization_builder(self) init(tc, m) do super end @@ -348,7 +348,7 @@ end # Another pass visitor for syntax analysis. # * Compute types in ancestors private class ClassAncestorBuilder -special AbsSyntaxVisitor + super AbsSyntaxVisitor redef fun visit(n) do n.accept_class_ancestor_builder(self) init(tc, m) do super end @@ -356,7 +356,7 @@ end # Another pass visitor for syntax analysis. # * Checks classes in regard to superclasses private class ClassVerifierVisitor -special AbsSyntaxVisitor + super AbsSyntaxVisitor redef fun visit(n) do n.accept_class_verifier(self) init(tc, m) do super end @@ -367,7 +367,7 @@ end # * Build local properties and attache them to global properties # * Attach bound to formal types private class PropertyBuilderVisitor -special AbsSyntaxVisitor + super AbsSyntaxVisitor redef fun visit(n) do n.accept_property_builder(self) init(tc, m) do super end @@ -375,7 +375,7 @@ end # Another pass pass visitor for syntax analysis. # * Check property conformance private class PropertyVerifierVisitor -special AbsSyntaxVisitor + super AbsSyntaxVisitor # The signature currently build readable writable var _signature_builder: SignatureBuilder @@ -426,43 +426,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 APackagedecl +redef class AModuledecl redef fun accept_class_builder(v) do - if n_id.to_symbol != v.mmmodule.name then - v.error(n_id, "Error: Package name missmatch 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 missmatch between {v.mmmodule.name} and {n_name.n_id.to_symbol}") end end end @@ -477,7 +472,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 +524,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 +536,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 +556,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 @@ -569,15 +630,15 @@ end redef class AClasskind fun is_interface: Bool do return false - fun is_universal: Bool do return false + fun is_enum: Bool do return false fun is_abstract: Bool do return false end redef class AInterfaceClasskind redef fun is_interface do return true end -redef class AUniversalClasskind - redef fun is_universal do return true +redef class AEnumClasskind + redef fun is_enum do return true end redef class AAbstractClasskind redef fun is_abstract do return true @@ -592,62 +653,6 @@ redef class AStdClassdef do return n_formaldefs.length end - redef fun accept_class_verifier(v) - do - super - var glob = _local_class.global - if glob.intro == _local_class then - # Intro - glob.visibility_level = visibility_level - glob.is_interface = n_classkind.is_interface - glob.is_abstract = n_classkind.is_abstract - glob.is_universal = n_classkind.is_universal - if n_kwredef != null then - v.error(self, "Redef error: No class {name} is imported. Remove the redef keyword to define a new class.") - end - - for c in _local_class.cshe.direct_greaters do - var cg = c.global - if glob.is_interface then - if cg.is_universal then - v.error(self, "Special error: Interface {name} try to specialise universal 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_universal then - if not cg.is_interface and not cg.is_universal then - v.error(self, "Special error: Universal class {name} try to specialise class {c.name}.") - end - else - if cg.is_universal then - v.error(self, "Special error: Class {name} try to specialise universal class {c.name}.") - end - end - - end - return - end - - # Redef - - glob.check_visibility(v, self, v.mmmodule) - if 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 - not glob.is_interface and n_classkind.is_interface or - not glob.is_abstract and n_classkind.is_abstract or - not glob.is_universal and n_classkind.is_universal - then - v.error(self, "Redef error: cannot change kind of class {name}.") - end - end redef fun visibility_level do @@ -772,14 +777,14 @@ redef class APropdef if glob.is_attribute then if gbc.is_interface then v.error(self, "Error: Attempt to define attribute {prop} in the interface {prop.local_class}.") - else if gbc.is_universal then - v.error(self, "Error: Attempt to define attribute {prop} in the universal class {prop.local_class}.") + else if gbc.is_enum then + v.error(self, "Error: Attempt to define attribute {prop} in the enum class {prop.local_class}.") end else if glob.is_init then if gbc.is_interface then v.error(self, "Error: Attempt to define a constructor {prop} in the class {prop.local_class}.") - else if gbc.is_universal then - v.error(self, "Error: Attempt to define a constructor {prop} in the universal {prop.local_class}.") + else if gbc.is_enum then + v.error(self, "Error: Attempt to define a constructor {prop} in the enum {prop.local_class}.") end end if prop.signature == null then @@ -845,7 +850,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}" @@ -921,20 +928,33 @@ redef class AAttrPropdef redef fun accept_property_builder(v) do super - var name = n_id.to_symbol + var name: Symbol + if n_id != null then + name = n_id.to_symbol + else + name = ("@" + n_id2.text).to_symbol + end var lc = v.local_class var prop = new MMSrcAttribute(name, lc, self) _prop = prop v.local_class.add_src_local_property(v, prop) - if n_readable != null then - name = n_id.text.substring_from(1).to_symbol + if n_readable != null or n_id == null then + if n_id != null then + name = n_id.text.substring_from(1).to_symbol + else + name = n_id2.to_symbol + end var readmethod = new MMReadImplementationMethod(name, lc, self) _readmethod = readmethod v.local_class.add_src_local_property(v, readmethod) end - if n_writable != null then - name = (n_id.text.substring_from(1) + "=").to_symbol + if n_writable != null or n_id == null then + if n_id != null then + name = (n_id.text.substring_from(1) + "=").to_symbol + else + name = (n_id2.text + "=").to_symbol + end var writemethod = new MMWriteImplementationMethod(name, lc, self) _writemethod = writemethod v.local_class.add_src_local_property(v, writemethod) @@ -957,17 +977,21 @@ redef class AAttrPropdef var signature = new MMSignature(new Array[MMType], t, v.local_class.get_type) prop.signature = signature var visibility_level = n_visibility.level - process_and_check(v, prop, n_kwredef != null, visibility_level) - if n_readable != null then + process_and_check(v, prop, n_id != null and n_kwredef != null, visibility_level) + if n_readable != null or n_id == null then var m = _readmethod.as(not null) m.signature = signature - process_and_check(v, m, n_readable.n_kwredef != null, visibility_level) + 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) end - if n_writable != null then + if n_writable != null or n_id == null then var m = _writemethod.as(not null) m.signature = new MMSignature(new Array[MMType].with_items(t), null, v.local_class.get_type) - process_and_check(v, m, n_writable.n_kwredef != null, visibility_level) + var vl = visibility_level + if n_id == null then + 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) end end @@ -1097,7 +1121,7 @@ end # Visitor used to build a full method name from multiple tokens private class MethidAccumulator -special Visitor + super Visitor readable var _name: Buffer = new Buffer redef fun visit(n) do