From 265f00f03bda8aa0b0c4870921a669d56953f742 Mon Sep 17 00:00:00 2001 From: "Tristan B. Kildaire" Date: Thu, 1 Apr 2021 08:56:06 +0200 Subject: [PATCH] Made error messages more verbose --- source/tlang/compiler/typecheck/core.d | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/source/tlang/compiler/typecheck/core.d b/source/tlang/compiler/typecheck/core.d index dc210fb..7e05ebc 100644 --- a/source/tlang/compiler/typecheck/core.d +++ b/source/tlang/compiler/typecheck/core.d @@ -286,7 +286,7 @@ public final class TypeChecker */ if(resolver.resolveUp(c, clazz.getName()) != clazz) { - Parser.expect("Error defining class with same name in same container: ClassTried: "~clazz.getName()~", Container: "~c.getName()); + Parser.expect("Cannot define class \""~resolver.generateName(modulle, clazz)~"\" as one with same name, \""~resolver.generateName(modulle,resolver.resolveUp(c, clazz.getName()))~"\" exists in container \""~resolver.generateName(modulle, c)~"\""); } else { @@ -296,11 +296,10 @@ public final class TypeChecker /* Don't allow a class to be named after it's container */ // if(!parentContainer) // { - if(cmp(c.getName(), clazz.getName()) == 0) - { - - Parser.expect("Class \""~resolver.generateName(modulle, clazz)~"\" cannot be defined within container with same name, \""~resolver.generateName(modulle, c)~"\""); - } + if(cmp(c.getName(), clazz.getName()) == 0) + { + Parser.expect("Class \""~resolver.generateName(modulle, clazz)~"\" cannot be defined within container with same name, \""~resolver.generateName(modulle, c)~"\""); + } // } /* TODO: We allow shaddowing so below is disabled */