X-Git-Url: http://nitlanguage.org?ds=sidebyside diff --git a/src/semantize/typing.nit b/src/semantize/typing.nit index 4bef8a2..e7a5a09 100644 --- a/src/semantize/typing.nit +++ b/src/semantize/typing.nit @@ -118,9 +118,9 @@ private class TypeVisitor end if sub.need_anchor then var u = anchor_to(sub) - self.modelbuilder.error(node, "Type error: expected {sup}, got {sub}: {u}") + self.modelbuilder.error(node, "Type Error: expected `{sup}`, got `{sub}: {u}`.") else - self.modelbuilder.error(node, "Type error: expected {sup}, got {sub}") + self.modelbuilder.error(node, "Type Error: expected `{sup}`, got `{sub}`.") end return null end @@ -150,7 +150,7 @@ private class TypeVisitor end return null # forward error end - self.error(nexpr, "Type error: expected expression.") + self.error(nexpr, "Error: expected an expression.") return null end @@ -193,9 +193,9 @@ private class TypeVisitor if sup == null then return null # Forward error if sup == sub then - self.modelbuilder.warning(node, "useless-type-test", "Warning: Expression is already a {sup}.") + self.modelbuilder.warning(node, "useless-type-test", "Warning: expression is already a `{sup}`.") else if self.is_subtype(sub, sup) then - self.modelbuilder.warning(node, "useless-type-test", "Warning: Expression is already a {sup} since it is a {sub}.") + self.modelbuilder.warning(node, "useless-type-test", "Warning: expression is already a `{sup}` since it is a `{sub}`.") end return sup end @@ -307,7 +307,7 @@ private class TypeVisitor if objclass == null then return null # Forward error unsafe_type = objclass.mclass_type else - self.error(node, "Error: Method '{name}' call on 'null'.") + self.error(node, "Error: method `{name}` called on `null`.") return null end end @@ -319,11 +319,12 @@ private class TypeVisitor end if mproperty == null then - #self.modelbuilder.error(node, "Type error: property {name} not found in {unsafe_type} (ie {recvtype})") if recv_is_self then - self.modelbuilder.error(node, "Error: Method or variable '{name}' unknown in {recvtype}.") + self.modelbuilder.error(node, "Error: method or variable `{name}` unknown in `{recvtype}`.") + else if recvtype.need_anchor then + self.modelbuilder.error(node, "Error: method `{name}` does not exists in `{recvtype}: {unsafe_type}`.") else - self.modelbuilder.error(node, "Error: Method '{name}' doesn't exists in {recvtype}.") + self.modelbuilder.error(node, "Error: method `{name}` does not exists in `{recvtype}`.") end return null end @@ -331,14 +332,14 @@ private class TypeVisitor assert mproperty isa MMethod if is_toplevel_context and recv_is_self and not mproperty.is_toplevel then - error(node, "Error: '{name}' is not a top-level method, thus need a receiver.") + error(node, "Error: `{name}` is not a top-level method, thus need a receiver.") end if not recv_is_self and mproperty.is_toplevel then - error(node, "Error: cannot call '{name}', a top-level method, with a receiver.") + error(node, "Error: cannot call `{name}`, a top-level method, with a receiver.") end if mproperty.visibility == protected_visibility and not recv_is_self and self.mmodule.visibility_for(mproperty.intro_mclassdef.mmodule) < intrude_visibility and not modelbuilder.toolcontext.opt_ignore_visibility.value then - self.modelbuilder.error(node, "Error: Method '{name}' is protected and can only acceded by self.") + self.modelbuilder.error(node, "Error: method `{name}` is protected and can only accessed by `self`.") return null end @@ -346,21 +347,21 @@ private class TypeVisitor if info != null and self.mpropdef.mproperty.deprecation == null then var mdoc = info.mdoc if mdoc != null then - self.modelbuilder.warning(node, "deprecated-method", "Deprecation Warning: Method '{name}' is deprecated: {mdoc.content.first}") + self.modelbuilder.warning(node, "deprecated-method", "Deprecation Warning: method `{name}` is deprecated: {mdoc.content.first}") else - self.modelbuilder.warning(node, "deprecated-method", "Deprecation Warning: Method '{name}' is deprecated.") + self.modelbuilder.warning(node, "deprecated-method", "Deprecation Warning: method `{name}` is deprecated.") end end var propdefs = mproperty.lookup_definitions(self.mmodule, unsafe_type) var mpropdef if propdefs.length == 0 then - self.modelbuilder.error(node, "Type error: no definition found for property {name} in {unsafe_type}") + self.modelbuilder.error(node, "Type Error: no definition found for property `{name}` in `{unsafe_type}`.") return null else if propdefs.length == 1 then mpropdef = propdefs.first else - self.modelbuilder.warning(node, "property-conflict", "Warning: conflicting property definitions for property {name} in {unsafe_type}: {propdefs.join(" ")}") + self.modelbuilder.warning(node, "property-conflict", "Warning: conflicting property definitions for property `{name}` in `{unsafe_type}`: {propdefs.join(" ")}") mpropdef = mproperty.intro end @@ -397,17 +398,16 @@ private class TypeVisitor # Visit the expressions of args and check their conformity with the corresponding type in signature # The point of this method is to handle varargs correctly # Note: The signature must be correctly adapted - fun check_signature(node: ANode, args: Array[AExpr], name: String, msignature: MSignature): Bool + fun check_signature(node: ANode, args: Array[AExpr], mproperty: MProperty, msignature: MSignature): Bool do var vararg_rank = msignature.vararg_rank if vararg_rank >= 0 then if args.length < msignature.arity then - #self.modelbuilder.error(node, "Error: Incorrect number of parameters. Got {args.length}, expected at least {msignature.arity}. Signature is {msignature}") - self.modelbuilder.error(node, "Error: arity mismatch; prototype is '{name}{msignature}'") + modelbuilder.error(node, "Error: expected at least {msignature.arity} argument(s) for `{mproperty}{msignature}`; got {args.length}. See introduction at `{mproperty.full_name}`.") return false end else if args.length != msignature.arity then - self.modelbuilder.error(node, "Error: Incorrect number of parameters. Got {args.length}, expected {msignature.arity}. Signature is {msignature}") + modelbuilder.error(node, "Error: expected {msignature.arity} argument(s) for `{mproperty}{msignature}`; got {args.length}. See introduction at `{mproperty.full_name}`.") return false end @@ -451,10 +451,7 @@ private class TypeVisitor if not variable.is_adapted then return variable.declared_type var flow = node.after_flow_context - if flow == null then - self.error(node, "No context!") - return null - end + if flow == null then return null # skip error if flow.vars.has_key(variable) then return flow.vars[variable] @@ -545,7 +542,7 @@ class CallSite private fun check_signature(v: TypeVisitor, args: Array[AExpr]): Bool do - return v.check_signature(self.node, args, self.mproperty.name, self.msignature) + return v.check_signature(self.node, args, self.mproperty, self.msignature) end end @@ -653,7 +650,7 @@ redef class AMethPropdef if not nblock.after_flow_context.is_unreachable and msignature.return_mtype != null then # We reach the end of the function without having a return, it is bad - v.error(self, "Control error: Reached end of function (a 'return' with a value was expected).") + v.error(self, "Error: reached end of function; expected `return` with a value.") end end end @@ -679,7 +676,7 @@ redef class AAttrPropdef v.visit_stmt(nblock) if not nblock.after_flow_context.is_unreachable then # We reach the end of the init without having a return, it is bad - v.error(self, "Control error: Reached end of block (a 'return' with a value was expected).") + v.error(self, "Error: reached end of block; expected `return`.") end end end @@ -836,7 +833,7 @@ redef class AReassignFormExpr self.read_type = readtype - var callsite = v.get_method(self, readtype, reassign_name, false) + var callsite = v.get_method(self.n_assign_op, readtype, reassign_name, false) if callsite == null then return null # Skip error self.reassign_callsite = callsite @@ -915,10 +912,10 @@ redef class AReturnExpr v.visit_expr_subtype(nexpr, ret_type) else v.visit_expr(nexpr) - v.error(self, "Error: Return with value in a procedure.") + v.error(nexpr, "Error: `return` with value in a procedure.") end else if ret_type != null then - v.error(self, "Error: Return without value in a function.") + v.error(self, "Error: `return` without value in a function.") end self.is_typed = true end @@ -961,7 +958,7 @@ redef class AIfexprExpr var t = v.merge_types(self, [t1, t2]) if t == null then - v.error(self, "Type Error: ambiguous type {t1} vs {t2}") + v.error(self, "Type Error: ambiguous type `{t1}` vs `{t2}`.") end self.mtype = t end @@ -1010,7 +1007,7 @@ redef class AForExpr private fun do_type_iterator(v: TypeVisitor, mtype: MType) do if mtype isa MNullType then - v.error(self, "Type error: 'for' cannot iterate over 'null'") + v.error(self, "Type Error: `for` cannot iterate over `null`.") return end @@ -1021,7 +1018,7 @@ redef class AForExpr # check iterator method var itdef = v.get_method(self, mtype, "iterator", n_expr isa ASelfExpr) if itdef == null then - v.error(self, "Type Error: 'for' expects a type providing 'iterator' method, got '{mtype}'.") + v.error(self, "Type Error: `for` expects a type providing an `iterator` method, got `{mtype}`.") return end self.method_iterator = itdef @@ -1029,7 +1026,7 @@ redef class AForExpr # check that iterator return something var ittype = itdef.msignature.return_mtype if ittype == null then - v.error(self, "Type Error: 'for' expects method 'iterator' to return an 'Iterator' or 'MapIterator' type'.") + v.error(self, "Type Error: `for` expects the method `iterator` to return an `Iterator` or `MapIterator` type.") return end @@ -1044,7 +1041,7 @@ redef class AForExpr var coltype = ittype.supertype_to(v.mmodule, v.anchor, colit_cla) var variables = self.variables if variables.length != 1 then - v.error(self, "Type Error: 'for' expects only one variable when using 'Iterator'.") + v.error(self, "Type Error: `for` expects only one variable when using `Iterator`.") else variables.first.declared_type = coltype.arguments.first end @@ -1056,7 +1053,7 @@ redef class AForExpr var coltype = ittype.supertype_to(v.mmodule, v.anchor, mapit_cla) var variables = self.variables if variables.length != 2 then - v.error(self, "Type Error: 'for' expects two variables when using 'MapIterator'.") + v.error(self, "Type Error: `for` expects two variables when using `MapIterator`.") else variables[0].declared_type = coltype.arguments[0] variables[1].declared_type = coltype.arguments[1] @@ -1065,7 +1062,7 @@ redef class AForExpr end if not is_col and not is_map then - v.error(self, "Type Error: 'for' expects method 'iterator' to return an 'Iterator' or 'MapIterator' type'.") + v.error(self, "Type Error: `for` expects the method `iterator` to return an `Iterator` or `MapIterator` type.") return end @@ -1078,21 +1075,21 @@ redef class AForExpr # get methods is_ok, next, item var ikdef = v.get_method(self, ittype, "is_ok", false) if ikdef == null then - v.error(self, "Type Error: 'for' expects a method 'is_ok' in 'Iterator' type {ittype}.") + v.error(self, "Type Error: `for` expects a method `is_ok` in type `{ittype}`.") return end self.method_is_ok = ikdef var itemdef = v.get_method(self, ittype, "item", false) if itemdef == null then - v.error(self, "Type Error: 'for' expects a method 'item' in 'Iterator' type {ittype}.") + v.error(self, "Type Error: `for` expects a method `item` in type `{ittype}`.") return end self.method_item = itemdef var nextdef = v.get_method(self, ittype, "next", false) if nextdef == null then - v.error(self, "Type Error: 'for' expects a method 'next' in 'Iterator' type {ittype}.") + v.error(self, "Type Error: `for` expects a method `next` in type {ittype}.") return end self.method_next = nextdef @@ -1102,7 +1099,7 @@ redef class AForExpr if is_map then var keydef = v.get_method(self, ittype, "key", false) if keydef == null then - v.error(self, "Type Error: 'for' expects a method 'key' in 'Iterator' type {ittype}.") + v.error(self, "Type Error: `for` expects a method `key` in type `{ittype}`.") return end self.method_key = keydef @@ -1212,7 +1209,7 @@ redef class AOrElseExpr end if t1 isa MNullType then - v.error(n_expr, "Type error: or else on null") + v.error(n_expr, "Type Error: `or else` on `null`.") else if v.check_can_be_null(n_expr, t1) then t1 = t1.as_notnull end @@ -1391,7 +1388,7 @@ redef class ARangeExpr else if v.is_subtype(t2, t1) then mtype = mclass.get_mtype([t1]) else - v.error(self, "Type Error: Cannot create range: {t1} vs {t2}") + v.error(self, "Type Error: cannot create range: `{t1}` vs `{t2}`.") return end @@ -1453,7 +1450,7 @@ redef class AAsNotnullExpr if mtype == null then return # Forward error if mtype isa MNullType then - v.error(self, "Type error: as(not null) on null") + v.error(self, "Type Error: `as(not null)` on `null`.") return end @@ -1484,7 +1481,7 @@ redef class ASelfExpr redef fun accept_typing(v) do if v.is_toplevel_context and not self isa AImplicitSelfExpr then - v.error(self, "Error: self cannot be used in top-level method.") + v.error(self, "Error: `self` cannot be used in top-level method.") end var variable = v.selfvariable self.its_variable = variable @@ -1512,20 +1509,21 @@ redef class ASendExpr var nrecv = self.n_expr var recvtype = v.visit_expr(nrecv) var name = self.property_name + var node = self.property_node if recvtype == null then return # Forward error var callsite = null var unsafe_type = v.anchor_to(recvtype) - var mproperty = v.try_get_mproperty_by_name2(self, unsafe_type, name) + var mproperty = v.try_get_mproperty_by_name2(node, unsafe_type, name) if mproperty == null and nrecv isa AImplicitSelfExpr then # Special fall-back search in `sys` when noting found in the implicit receiver. - var sysclass = v.try_get_mclass(self, "Sys") + var sysclass = v.try_get_mclass(node, "Sys") if sysclass != null then var systype = sysclass.mclass_type - mproperty = v.try_get_mproperty_by_name2(self, systype, name) + mproperty = v.try_get_mproperty_by_name2(node, systype, name) if mproperty != null then - callsite = v.get_method(self, systype, name, false) + callsite = v.get_method(node, systype, name, false) if callsite == null then return # Forward error # Update information, we are looking at `sys` now, not `self` nrecv.is_sys = true @@ -1537,7 +1535,7 @@ redef class ASendExpr end if callsite == null then # If still nothing, just exit - callsite = v.get_method(self, recvtype, name, nrecv isa ASelfExpr) + callsite = v.get_method(node, recvtype, name, nrecv isa ASelfExpr) if callsite == null then return end @@ -1551,10 +1549,10 @@ redef class ASendExpr if callsite.mproperty.is_init then var vmpropdef = v.mpropdef if not (vmpropdef isa MMethodDef and vmpropdef.mproperty.is_init) then - v.error(self, "Can call a init only in another init") + v.error(node, "Error: an `init` can only be called from another `init`.") end if vmpropdef isa MMethodDef and vmpropdef.mproperty.is_root_init and not callsite.mproperty.is_root_init then - v.error(self, "Error: {vmpropdef} cannot call a factory {callsite.mproperty}") + v.error(node, "Error: `{vmpropdef}` cannot call a factory `{callsite.mproperty}`.") end end @@ -1702,7 +1700,7 @@ redef class ASendReassignFormExpr var readtype = callsite.msignature.return_mtype if readtype == null then - v.error(self, "Error: {name} is not a function") + v.error(node, "Error: `{name}` is not a function.") return end @@ -1761,7 +1759,7 @@ redef class ASuperExpr assert recvtype != null var mproperty = v.mpropdef.mproperty if not mproperty isa MMethod then - v.error(self, "Error: super only usable in a method") + v.error(self, "Error: `super` only usable in a `method`.") return end var superprops = mproperty.lookup_super_definitions(v.mmodule, anchor) @@ -1770,7 +1768,7 @@ redef class ASuperExpr process_superinit(v) return end - v.error(self, "Error: No super method to call for {mproperty}.") + v.error(self, "Error: no super method to call for `{mproperty}`.") return end # FIXME: covariance of return type in linear extension? @@ -1780,7 +1778,7 @@ redef class ASuperExpr msignature = v.resolve_for(msignature, recvtype, true).as(MSignature) var args = self.n_args.to_a if args.length > 0 then - v.check_signature(self, args, mproperty.name, msignature) + v.check_signature(self, args, mproperty, msignature) end self.mtype = msignature.return_mtype self.is_typed = true @@ -1810,7 +1808,7 @@ redef class ASuperExpr continue end if superprop != null and superprop.mproperty != candidate and not superprop.mproperty.is_root_init then - v.error(self, "Error: conflicting super constructor to call for {mproperty}: {candidate.full_name}, {superprop.mproperty.full_name}") + v.error(self, "Error: conflicting super constructor to call for `{mproperty}`: `{candidate.full_name}`, `{superprop.mproperty.full_name}`") return end var candidatedefs = candidate.lookup_definitions(v.mmodule, anchor) @@ -1819,13 +1817,13 @@ redef class ASuperExpr candidatedefs.add(superprop) end if candidatedefs.length > 1 then - v.error(self, "Error: conflicting property definitions for property {mproperty} in {recvtype}: {candidatedefs.join(", ")}") + v.error(self, "Error: conflicting property definitions for property `{mproperty}` in `{recvtype}`: {candidatedefs.join(", ")}") return end superprop = candidatedefs.first end if superprop == null then - v.error(self, "Error: No super method to call for {mproperty}.") + v.error(self, "Error: no super method to call for `{mproperty}`.") return end @@ -1841,7 +1839,7 @@ redef class ASuperExpr else # Check there is at least enough parameters if mpropdef.msignature.arity < msignature.arity then - v.error(self, "Error: Not enough implicit arguments to pass. Got {mpropdef.msignature.arity}, expected at least {msignature.arity}. Signature is {msignature}") + v.error(self, "Error: not enough implicit arguments to pass. Got `{mpropdef.msignature.arity}`, expected at least `{msignature.arity}`. Signature is `{msignature}`.") return end # Check that each needed parameter is conform @@ -1849,7 +1847,7 @@ redef class ASuperExpr for sp in msignature.mparameters do var p = mpropdef.msignature.mparameters[i] if not v.is_subtype(p.mtype, sp.mtype) then - v.error(self, "Type error: expected argument #{i} of type {sp.mtype}, got implicit argument {p.name} of type {p.mtype}. Signature is {msignature}") + v.error(self, "Type Error: expected argument #{i} of type `{sp.mtype}`, got implicit argument `{p.name}` of type `{p.mtype}`. Signature is {msignature}") return end i += 1 @@ -1876,10 +1874,13 @@ redef class ANewExpr if not recvtype isa MClassType then if recvtype isa MNullableType then - v.error(self, "Type error: cannot instantiate the nullable type {recvtype}.") + v.error(self, "Type Error: cannot instantiate the nullable type `{recvtype}`.") + return + else if recvtype isa MFormalType then + v.error(self, "Type Error: cannot instantiate the formal type `{recvtype}`.") return else - v.error(self, "Type error: cannot instantiate the formal type {recvtype}.") + v.error(self, "Type Error: cannot instantiate the type `{recvtype}`.") return end end @@ -1899,7 +1900,7 @@ redef class ANewExpr end if name == "intern" then if kind != concrete_kind then - v.error(self, "Type Error: Cannot instantiate {kind} {recvtype}.") + v.error(self, "Type Error: cannot instantiate {kind} {recvtype}.") return end if n_args.n_exprs.not_empty then @@ -1916,7 +1917,7 @@ redef class ANewExpr if not callsite.mproperty.is_new then if kind != concrete_kind then - v.error(self, "Type Error: Cannot instantiate {kind} {recvtype}.") + v.error(self, "Type Error: cannot instantiate {kind} `{recvtype}`.") return end self.mtype = recvtype @@ -1928,7 +1929,7 @@ redef class ANewExpr self.callsite = callsite if not callsite.mproperty.is_init_for(recvtype.mclass) then - v.error(self, "Error: {name} is not a constructor.") + v.error(self, "Error: `{name}` is not a constructor.") return end @@ -1940,27 +1941,28 @@ end #### redef class AAttrFormExpr - # The attribute acceded. + # The attribute accessed. var mproperty: nullable MAttribute # The static type of the attribute. var attr_type: nullable MType - # Resolve the attribute acceded. + # Resolve the attribute accessed. private fun resolve_property(v: TypeVisitor) do var recvtype = v.visit_expr(self.n_expr) if recvtype == null then return # Skip error - var name = self.n_id.text + var node = self.n_id + var name = node.text if recvtype isa MNullType then - v.error(self, "Error: Attribute '{name}' access on 'null'.") + v.error(node, "Error: attribute `{name}` access on `null`.") return end var unsafe_type = v.anchor_to(recvtype) - var mproperty = v.try_get_mproperty_by_name2(self, unsafe_type, name) + var mproperty = v.try_get_mproperty_by_name2(node, unsafe_type, name) if mproperty == null then - v.modelbuilder.error(self, "Error: Attribute {name} doesn't exists in {recvtype}.") + v.modelbuilder.error(node, "Error: attribute `{name}` does not exist in `{recvtype}`.") return end assert mproperty isa MAttribute @@ -2019,7 +2021,7 @@ redef class AIssetAttrExpr var recvtype = self.n_expr.mtype.as(not null) var bound = v.resolve_for(mtype, recvtype, false) if bound isa MNullableType then - v.error(self, "Error: isset on a nullable attribute.") + v.error(n_id, "Type Error: `isset` on a nullable attribute.") end self.mtype = v.type_bool(self) end @@ -2031,7 +2033,7 @@ redef class AVarargExpr # This kind of pseudo-expression can be only processed trough a signature # See `check_signature` # Other cases are a syntax error. - v.error(self, "Syntax error: unexpected `...`") + v.error(self, "Syntax Error: unexpected `...`.") end end