From 6ce2469bf8891c2c489006d8b40f16d8540ddb87 Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Tue, 29 Oct 2024 16:22:44 +0100 Subject: [PATCH] Minor. --- .../frontend/snapi/extensions/builtin/JsonPackage.scala | 4 ++-- .../frontend/snapi/extensions/builtin/XmlPackage.scala | 2 +- .../snapi/frontend/inferrer/local/LocalInferrerTest.scala | 2 ++ .../snapi/frontend/inferrer/local/RD3852Test.scala | 8 ++++++-- .../builtin/location_package/LocationDescribeNode.java | 2 ++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/JsonPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/JsonPackage.scala index fe392f874..18d0bd2bc 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/JsonPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/JsonPackage.scala @@ -128,7 +128,7 @@ class InferAndReadJsonEntry extends SugarEntryExtension with JsonEntryExtensionH val preferNulls = optionalArgs.collectFirst { case a if a._1 == "preferNulls" => a._2 }.forall(getBoolValue) val inferenceDiagnostic: Either[Seq[ErrorCompilerMessage], InferrerOutput] = getJsonInferrerProperties(mandatoryArgs, optionalArgs) - .flatMap(i => programContext.infer(i)) + .flatMap(programContext.infer) .left .map(error => Seq(InvalidSemantic(node, error))) for ( @@ -366,7 +366,7 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension Seq(ValueArg(SnapiLocationValue(new InMemoryByteStreamLocation(codeData), ""), SnapiLocationType())), optionalArgs ) - .flatMap(i => programContext.infer(i)) + .flatMap(programContext.infer) .left .map(error => Seq(InvalidSemantic(node, error))) for ( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/XmlPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/XmlPackage.scala index 6866d3d64..0bbd914ce 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/XmlPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/XmlPackage.scala @@ -107,7 +107,7 @@ class InferAndReadXmlEntry extends SugarEntryExtension with XmlEntryExtensionHel varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { val inferenceDiagnostic = getXmlInferrerProperties(mandatoryArgs, optionalArgs) - .flatMap(i => programContext.infer(i)) + .flatMap(programContext.infer) .left .map(error => Seq(InvalidSemantic(node, error))) val preferNulls = optionalArgs.collectFirst { case a if a._1 == "preferNulls" => a._2 }.forall(getBoolValue); diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTest.scala index 816d6d76a..08563a4b9 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTest.scala @@ -48,6 +48,7 @@ class LocalInferrerTest extends RawTestSuite with SettingsTestContext with Stric inferrer.infer(AutoInferrerInput(l1, None)) assert(detectedEncoding == encoding) } finally { + RawUtils.withSuppressNonFatalException(inferrer.stop()) RawUtils.withSuppressNonFatalException(f.delete()) } } @@ -75,6 +76,7 @@ class LocalInferrerTest extends RawTestSuite with SettingsTestContext with Stric }) } } finally { + RawUtils.withSuppressNonFatalException(inferrer.stop()) RawUtils.withSuppressNonFatalException(ex.shutdownNow()) } } diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852Test.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852Test.scala index e245cd094..a3043a623 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852Test.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852Test.scala @@ -27,8 +27,12 @@ class RD3852Test extends RawTestSuite with SettingsTestContext with StrictLoggin val inferrer = new LocalInferrerService val p = RawUtils.getResource("data/students/students.csv") val l1 = new LocalPath(p) - val TextInputStreamInferrerOutput(_, _, format) = inferrer.infer(AutoInferrerInput(l1, None)) - assert(format.isInstanceOf[CsvFormatDescriptor]) + try { + val TextInputStreamInferrerOutput(_, _, format) = inferrer.infer(AutoInferrerInput(l1, None)) + assert(format.isInstanceOf[CsvFormatDescriptor]) + } finally { + RawUtils.withSuppressNonFatalException(inferrer.stop()) + } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java index ad20f1c8c..61b0dcc49 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java @@ -221,6 +221,8 @@ protected Object doDescribe( return record; } catch (RawException ex) { return new ErrorObject(ex.getMessage()); + } finally { + inferrer.stop(); } } }