diff --git a/pom.xml b/pom.xml index 4620ecd844..ba58b36098 100644 --- a/pom.xml +++ b/pom.xml @@ -458,7 +458,7 @@ org.rascalmpl typepal - 0.16.3 + 0.16.4 compile diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/CollectDeclaration.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/CollectDeclaration.rsc index 430458aaeb..ac70187861 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/check/CollectDeclaration.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/CollectDeclaration.rsc @@ -265,7 +265,7 @@ void collect(current: (FunctionDeclaration) ``, Collec ppfname = prettyPrintName(fname); modifiers = ["" | m <- signature.modifiers.modifiers]; tagsMap = getTags(decl.tags); - if(ignoreCompiler(tagsMap)) { + if(ignoreCompiler(tagsMap) && "test" notin modifiers) { c.report(info(fname, "Ignoring function declaration for ``")); return; } diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc index 186157ae81..3699b81896 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc @@ -44,7 +44,6 @@ import lang::rascalcore::check::NameUtils; import lang::rascalcore::compile::Rascal2muRascal::TmpAndLabel; import Location; -import analysis::typepal::LocationChecks; import lang::rascalcore::check::BasicRascalConfig; import lang::rascalcore::check::BuiltinFields; @@ -54,8 +53,7 @@ import lang::rascalcore::check::AType; import lang::rascalcore::check::ATypeUtils; import lang::rascalcore::check::ATypeInstantiation; - - +import analysis::typepal::LocationChecks; /* * This module provides a bridge to the "TModel" delivered by the type checker @@ -268,7 +266,7 @@ private loc findContainer(Define d){ } return cscope; } - + str findDefiningModule(loc l){ for(ms <- module_scopes,isContainedIn(l, ms, current_tmodel.logical2physical)){ return definitions[ms].id;