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
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_enum 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_extern and not c.global.is_interface then
c.process_default_constructors(mmbv2)
end
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
var super_inits = new ArraySet[MMLocalProperty]
var super_constructors = new ArraySet[MMGlobalProperty]
for sc in che.direct_greaters do
- if sc.global.is_enum or sc.global.is_interface then continue
+ if sc.global.is_enum and not sc.global.is_extern 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)
# 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)
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
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
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
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
fun is_interface: Bool do return false
fun is_enum: Bool do return false
fun is_abstract: Bool do return false
+ fun is_extern : Bool do return false
end
redef class AInterfaceClasskind
redef class AEnumClasskind
redef fun is_enum do return true
end
+redef class AExternClasskind
+ redef fun is_extern do return true
+end
redef class AAbstractClasskind
redef fun is_abstract do return true
end
do
return n_formaldefs.length
end
+ redef fun accept_class_specialization_builder(v)
+ do
+ super
+
+ var glob = local_class.global
+ if glob.intro == local_class then
+ glob.is_interface = n_classkind.is_interface
+ glob.is_abstract = n_classkind.is_abstract
+ glob.is_enum = n_classkind.is_enum
+ glob.is_extern = n_classkind.is_extern
+ glob.visibility_level = visibility_level
+ end
+ 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_enum = n_classkind.is_enum
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
+ if glob.is_extern then
+ glob.mmmodule.is_extern_hybrid = true
+ end
for c in _local_class.cshe.direct_greaters do
var cg = c.global
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 glob.is_extern then
+ if not cg.is_interface and not cg.is_extern then
+ v.error(self, "Special error: Extern 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}.")
+ else if cg.is_extern then
+ v.error(self, "Special error: Class {name} try to specialise extern class {c.name}.")
end
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_enum and n_classkind.is_enum
+ not glob.is_enum and n_classkind.is_enum or
+ not glob.is_extern and n_classkind.is_extern
then
v.error(self, "Redef error: cannot change kind of class {name}.")
end
v.error(self, "Error: Attempt to define attribute {prop} in the interface {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}.")
+ else if gbc.is_extern then
+ v.error(self, "Error: Attempt to define attribute {prop} in the extern class {prop.local_class}.")
end
else if glob.is_init then
if gbc.is_interface then
else if gbc.is_enum then
v.error(self, "Error: Attempt to define a constructor {prop} in the enum {prop.local_class}.")
end
+
+ # ok in extern
end
if prop.signature == null then
if glob.is_init then
# The part of process_and_check when prop is a redefinition
private fun do_and_check_redef(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)
do
- var is_init = self isa AConcreteInitPropdef
+ var is_init = self isa AInitPropdef
var glob = prop.global
if not has_redef then
t = v.type_array(t)
end
p.variable.stype = t
+
+ isig.params[p.position].name = p.variable.name
end
s = isig
prop.signature = s
super
var name: Symbol
if n_methid == null then
- if self isa AConcreteInitPropdef then
+ if self isa AInitPropdef then
name = once "init".to_symbol
else
name = once "main".to_symbol
end
end
-redef class AExternMethPropdef
+redef class AExternPropdef
redef fun accept_property_verifier(v)
do
super # Compute signature
ename = n_extern.text
ename = ename.substring(1, ename.length-2)
else
- ename = "{method.mmmodule.name}_{method.local_class.name}_{method.local_class.name}_{method.name}_{method.signature.arity}"
+ ename = method.default_extern_name
end
method.extern_name = ename
end