Minor.

raw-labs · Oct 29, 2024 · 6ce2469 · 6ce2469
1 parent 5538289
commit 6ce2469
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/...tend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/JsonPackage.scala b/...tend/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), "<value>"), SnapiLocationType())),
       optionalArgs
     )
-      .flatMap(i => programContext.infer(i))
+      .flatMap(programContext.infer)
       .left
       .map(error => Seq(InvalidSemantic(node, error)))
     for (

diff --git a/...ntend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/XmlPackage.scala b/...ntend/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/...frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTest.scala b/...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
@@ -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/.../rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java b/.../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();
     }
   }
 }